What was I doing
Merge branch 'master' of github.com:dmazin/asteroid-tycoon

Conflicts:
	state.js
Merge branch 'master' of github.com:dmazin/asteroid-tycoon

Conflicts:
	robot.js