small fix
Merge branch 'MajorMegaMerge' of
https://github.com/tortal/IT2-LP1-Tendu.git into MajorMegaMerge

Conflicts:
	Tendu/src/it/chalmers/tendu/controllers/ShapeGameModelController.java
fixed sending shapes
Merge branch 'MajorMegaMerge' of https://github.com/tortal/IT2-LP1-Tendu.git into MajorMegaMerge