Minor
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git into Majormerge
timer working on shapesgame
minor fix
Monor
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git
into Majormerge

Conflicts:
	Tendu/src/it/chalmers/tendu/controllers/ShapeGameModelController.java
Locked hopefully fixed.