I'm not sure what changed here, but apparently I have uncommitted changes
Merge branch 'master' of https://github.com/Swooper/SpaceJourney