Commits

Quincy Larson committed 9bdbb59b67cM
Merge branch 'bugron-basic_js_fix-2' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-basic_js_fix-2 Conflicts: seed/challenges/basic-javascript.json
Merge branch 'bugron-basic_js_fix-2' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-basic_js_fix-2 Conflicts: seed/challenges/basic-javascript.json