cleanup
Merge branch 'master' of github.com:gillesdemey/shoot-em-up