Working ON Install
Merge branch 'master' of https://github.com/Nberton/HUSTLE

Conflicts:
	eventPage.js