Michael Q Larson f4fcb565f4 Merge branch 'master' into ux-improvements ...

Conflicts:
	seed_data/coursewares.json

2015-02-22 18:17:47 -08:00

..

bonfires.json

Fix drop it like its hot challenge

2015-02-22 13:55:27 +09:00

coursewares.json

Merge branch 'master' into ux-improvements

2015-02-22 18:17:47 -08:00

seed.js

All coursewares list now displays properly, coursewares properly direct to the follow on, courseware controller now properly finds the next courseware

2015-02-22 18:23:50 +09:00