Michael Q Larson ef2eba7b14 Merge branch 'master' into refactor ...

Conflicts:
	app.js
	controllers/api.js
	controllers/challenges.js
	gulpfile.js

2014-12-23 12:34:09 -08:00

..

challenges.json

fix finished challenges button

2014-12-23 11:20:31 -08:00

seed_challenges.js

Major refactor. Add error handlers everywhere.

2014-12-23 08:48:28 -08:00