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

Conflicts:
	controllers/resources.js
	controllers/user.js
	seed_data/challenges.json
	views/account/show.jade
	views/coursewares/showHTML.jade
	views/coursewares/showJS.jade
	views/partials/bonfires.jade

2015-03-21 16:25:39 -07:00

..

bootstrap

More UX improvements

2015-02-22 16:46:55 +09:00

bootstrap-social

updated bootstrap-social

2014-11-08 20:05:45 -08:00

font-awesome-4.3.0

add font-awesome

2015-03-07 00:09:04 -08:00

ionicons

Change layout to grab ionicons css framework from local files

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

animate.min.less

create password cancellation confirmation page and minify animate.css

2014-10-24 16:41:09 -07:00