Stuff happens
Merge branch 'master' of https://github.com/MustachedNinja/MarsShooter