Tüzelés kezelése
Merge branch 'master' of https://github.com/mukris/asteroid.git

Conflicts:
	src/hu/bme/mit/asteroid/GameFactory.java
Merge branch 'master' of https://github.com/mukris/asteroid.git