Stuff as well
Merge remote-tracking branch 'upstream/master'

Conflicts:
	SpacecraftArena/src/com/github/kody104/SpacecraftArena.java