shiptest update
Merge branch 'master' of https://github.com/ThomasVyncke/Asteroids.git
shiptest