AaronM - Prepare for heroku deployment and have random events only later in the game
Merge branch 'master' of github.com:AliceYuan/SpaceAppsHackathon

Conflicts:
	js/main.js