refactoring
Merge branch 'master' of https://github.com/lukaselmer/ethz-game-lab