Michael Q Larson 70f812dc78 Merge branch 'master' into ux-improvements ... Conflicts: controllers/bonfire.js controllers/resources.js views/bonfire/show.jade		2015-03-29 13:05:39 -07:00
..
bonfireMDNlinks.js	links added, basic functionality working across pages.	2015-03-24 01:17:21 -04:00
bonfires.json	fixed comma error for merge.	2015-03-26 09:53:22 -04:00
coursewares.json	add javascript waypoints	2015-03-29 12:51:23 -07:00
seed.js	Merge branch 'master' into ux-improvements	2015-03-21 16:25:39 -07:00