Commits
Quincy Larson committed 1df962bb07bM
Merge branch 'master' into staging Conflicts: controllers/resources.js public/js/main_0.0.2.js seed/challenges/advanced-bonfires.json seed/challenges/basic-bonfires.json seed/challenges/get-set-for-free-code-camp.json server/views/partials/navbar.jade
