blah
Merge branch 'master' of https://github.com/UMCompass/Horizon

Conflicts:
	ExpressApp/public/javascripts/Login.js