Commits

Quincy Larson committed 465835d6b16M
Merge branch 'staging' into map-restructure Conflicts: seed/challenges/basic-ziplines.json seed/challenges/intermediate-ziplines.json
Merge branch 'staging' into map-restructure Conflicts: seed/challenges/basic-ziplines.json seed/challenges/intermediate-ziplines.json