Merge branch 'master' of https://github.com/dmazin/asteroid-tycoon

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