Added a test for ShapesGame.
Merge branch 'ShapesGameGraphics' of
https://github.com/tortal/IT2-LP1-Tendu.git into ShapesGameGraphics

Conflicts:
	Tendu/src/it/chalmers/tendu/screens/ShapesGameScreen.java
Merge branch 'ShapesGameGraphics' of https://github.com/tortal/IT2-LP1-Tendu.git into ShapesGameGraphics