Commits

Quincy Larson committed f33269d2b98M
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp Conflicts: seed_data/challenges/basic-html5-and-css.json
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp Conflicts: seed_data/challenges/basic-html5-and-css.json