sync nightly
Merge branch 'master' of https://github.com/alec500oo/SpaceGame

Conflicts:
	src/matthews/alec/game/Craft.java