Shapesgame now looks at model when rendering shapes.
Merge branch 'ShapesGameGraphics2' of
https://github.com/tortal/IT2-LP1-Tendu.git into ShapesGameGraphics2

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