Michael Q Larson f1000c3189 Merge branch 'master' into courseware ...

Conflicts:
	controllers/bonfire.js
	views/layout.jade

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

..

bonfire.jade

first commit with working iframe pulling data from code editor

2015-01-29 17:01:50 -08:00

generator.jade

BONFIRE READY TO SHIP

2015-01-28 00:59:30 -05:00

public-generator.jade

Refactor routing, minor display tweaks

2015-01-27 20:12:51 -05:00

show.jade

Merge branch 'master' into courseware

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