minor fixes
Merge branch 'master' of git://github.com/StudentLifeMarketingAndDesign/division-elearning-project

Conflicts:
	css/app.css
	css/app.css.map