name convention
Merge branch 'master' of https://github.com/tompudding/spacefight3000