Made a few changes
Merge branch 'master' of https://github.com/UKCHackMizzou2014/Global-Hack-III-Project

Conflicts:
	app/src/main/web/index.html