bullet commit
Merge branch 'master' of https://github.com/ec-sft/asteroids

Conflicts:
	src/main/java/com/ecsoft/asteroids/controller/Controller.java