breytingar
bla
Merge branch 'master' of https://github.com/GunnarSturla/Asteroids

Conflicts:
	SpaceObject.java
blabla
Merge branch 'master' of https://github.com/GunnarSturla/Asteroids

Conflicts:
	Bullet.class
	Bullet.java
	Ship.class
	Ship.java
	SpaceObject.class
	SpaceObject.java