First commit by Valdi
Merge branch 'master' of https://github.com/Swooper/SpaceJourney