woop
Merge branch 'master' of github.com:ec-sft/asteroids

Conflicts:
	src/main/java/com/ecsoft/asteroids/model/Projectile.java