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

Conflicts:
	Tendu/src/it/chalmers/tendu/screens/ShapesGameScreen.java