Test aangepast
Merge branch 'master' of https://github.com/onkruid/Asteroids.git

Conflicts:
	Asteroids/src/asteroids/ShipTest.java