Main Shizzle
Merge branch 'master' of https://github.com/QuantumInfinity/SpaceGame

Conflicts:
	.classpath
	.gitignore
Merge branch 'master' of https://github.com/QuantumInfinity/SpaceGame
Merge branch 'master' of https://github.com/QuantumInfinity/SpaceGame