Commits

Quincy Larson committed 3d08496eb85M
Merge branch 'staging' into bonfire-tests Conflicts: seed/challenges/basic-bonfires.json seed/challenges/intermediate-bonfires.json
Merge branch 'staging' into bonfire-tests Conflicts: seed/challenges/basic-bonfires.json seed/challenges/intermediate-bonfires.json