Commits

Quincy Larson committed 31f818788ddM
Merge branch 'patch-4' of https://github.com/souldreamer/FreeCodeCamp into souldreamer-patch-4 Conflicts: seed/challenges/basic-javascript.json
Merge branch 'patch-4' of https://github.com/souldreamer/FreeCodeCamp into souldreamer-patch-4 Conflicts: seed/challenges/basic-javascript.json