Quincy Larson 1df962bb07 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

2015-06-24 07:19:54 -07:00

..

resources.js

fix /chat should go to gitter

2015-06-20 23:17:09 -07:00