Commits

Quincy Larson committed d138757c52aM
Merge branch 'staging' into jquery Conflicts: seed/challenges/bootstrap.json seed/challenges/jquery.json
Merge branch 'staging' into jquery Conflicts: seed/challenges/bootstrap.json seed/challenges/jquery.json