Refactoring!
Merge branch 'ShapesGameController' of https://github.com/tortal/IT2-LP1-Tendu.git into ShapesGameController