collision
Merge branch 'master' of github.com:adrobisch/septemberjam

Conflicts:
	src/main/java/septemberjam/GameApplication.java
	src/main/java/septemberjam/SpaceshipLocationUpdate.java
fix speed, rock control