Mega næs
Merge branch 'master' of https://github.com/GunnarSturla/Asteroids

Conflicts:
	SpaceObject.java
Proper