Merge branch 'GameController'
Merge branch 'master' of https://github.com/victorbarbu/magic