AaronM - Fix bug where triggering a random event wouldn't advance event
Merge branch 'master' of github.com:AliceYuan/SpaceAppsHackathon
AaronM - Fix json and remove commented code