special commit for Zarthus
Merge branch 'master' of https://github.com/Tanjoodo/pong