add notion of tournament to game engine
resolve merge conflicts
always output collision debug ppm
Merge branch 'master' of https://github.com/forsythrosin/achdome