Shapes and locks render differently
Diamonds and rhomboids can be rendered.
End game works
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git
into Majormerge

Conflicts:
	Tendu/src/it/chalmers/tendu/gamemodel/shapesgame/ShapeGame.java
	Tendu/src/it/chalmers/tendu/screens/ShapeGameScreen.java