Michael Q Larson c7a5a51c8d Merge branch 'timestamp' into challenges ... Conflicts: config/passport.js public/css/main.less		2014-12-13 21:09:11 -08:00
..
lib	update colors per Rybar suggestions	2014-12-11 15:36:46 -08:00
themes	update the hackathon starter base app	2014-11-29 21:32:59 -08:00
main.less	Merge branch 'timestamp' into challenges	2014-12-13 21:09:11 -08:00