ship
Revert "Veit ekki hvað hefur breyst"

This reverts commit 6080dfc347323e092fb48c5f9ea7e47281c96215.
cx
Merge branch 'master' of https://github.com/GunnarSturla/Asteroids

Conflicts:
	SpaceObject.class
	SpaceObject.java
	asteroid.class
	asteroid.java