Learn more about cloning repositories
You have read-only access
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp Conflicts: views/resources/live-pair-programming.jade
