added 2 random events to data/randomevents.json
this data structure should allow the flexibility to handle different criteria without getting too complicated.
Merge branch 'master' of https://github.com/AliceYuan/SpaceAppsHackathon

Conflicts:
	js/models/playerinfo.js
Merge branch 'master' of https://github.com/AliceYuan/SpaceAppsHackathon