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

Conflicts:
	ExpressApp/routes/index.js