Nathan Leniz e2ab4438f5 Merge branch 'master' into courseware ...

Conflicts:
	controllers/bonfire.js
	controllers/resources.json
	views/bonfire/show.jade

2015-02-06 14:39:16 -05:00

..

bonfires.json

Merge branch 'master' into courseware

2015-02-06 14:39:16 -05:00

challenge-hashes

Fixed bonfire to not overwrite user entry point but still allow user error by not defining entry point, create web form to give challenge json back, improved layout of bonfire even more

2015-01-25 23:56:04 -05:00

challenges.json

Merge branch 'master' into courseware

2015-02-02 23:32:46 -08:00

coursewares.json

start creation of courseware challenges

2015-02-05 15:33:38 -08:00

seed.js

start adding Courseware controllers, routes etc.

2015-02-01 14:22:34 -08:00