I have no idea
Merge branch 'master' of https://github.com/jordonwii/galactic-command
Merge branch 'master' of https://github.com/jordonwii/galactic-command

Conflicts:
	game.coffee