Commits

Quincy Larson committed 565d4d13097M
Merge branch 'ahstro-3228' of https://github.com/ahstro/freecodecamp into ahstro-ahstro-3228 Conflicts: seed/challenges/basic-javascript.json
Merge branch 'ahstro-3228' of https://github.com/ahstro/freecodecamp into ahstro-ahstro-3228 Conflicts: seed/challenges/basic-javascript.json