Commits

Quincy Larson committed 27116645055M
Merge branch 'staging' into jquery Conflicts: seed/challenges/basic-ziplines.json seed/challenges/jquery.json
Merge branch 'staging' into jquery Conflicts: seed/challenges/basic-ziplines.json seed/challenges/jquery.json