local clear-up commit
Merge branch 'master' of https://github.com/TeamShakespeare/SpaceGame.git