Possible fix
Merge branch 'master' of github.com:antlong/multiverseminer

Conflicts:
	src/game/planet.js