minor
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git into Majormerge
no progress
ShapeGameModelController changes the "right" objects.
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git into Majormerge
move shape to proper pos when sent between devices W.I.P
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git
into Majormerge

Conflicts:
	Tendu/src/it/chalmers/tendu/controllers/ShapeGameModelController.java
The shape should now appear at the proper side of the screen when sent
from a device to another.
Shapes and locks render differently
Diamonds and rhomboids can be rendered.
Shapes appear as if they where sent from the appropriate sender W.I.P
Bugs still exist in "shape appears at proper location when sent" W.I.P
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
fail sound
sound fix
small fix
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git into Majormerge
sound
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git into Majormerge
Sound fixed