You can *really* make a Rover now.
Merge branch 'master' of https://github.com/AliceYuan/SpaceAppsHackathon

Conflicts:
	data/game.json