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

..

lib

Change layout to grab ionicons css framework from local files

2015-02-02 20:53:48 -05:00

themes

update the hackathon starter base app

2014-11-29 21:32:59 -08:00

main.less

Merge branch 'master' into courseware

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