Commits
Quincy Larson committed 61486c2d7c2M
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging Conflicts: app.js controllers/fieldGuide.js controllers/story.js seed/challenges/basic-html5-and-css.json seed/challenges/bootstrap.json seed/field-guides.json server/views/partials/navbar.jade views/resources/jobs-form.jade views/resources/nonprofits-form.jade views/resources/pmi-acp-agile-project-managers-form.jade
