Commits

Quincy Larson committed 378f6da2214M
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging Conflicts: public/js/main_0.0.3.js seed/challenges/get-set-for-free-code-camp.json seed/field-guides.json
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging Conflicts: public/js/main_0.0.3.js seed/challenges/get-set-for-free-code-camp.json seed/field-guides.json