Learn more about cloning repositories
You have read-only access
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp Conflicts: seed_data/challenges/basic-html5-and-css.json
