Includes test file.
Merge branch 'master' of https://github.com/groeneveld/SpaceGame.git
Includes test.