kiss
Merge branch 'master' of https://github.com/sebbekarlsson/SpaceSpace

Conflicts:
	bin/se/lignum/main/Game.class
	src/se/lignum/main/Game.java