Finally fixed the timing issue in number game
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git
into Majormerge

Conflicts:
	Tendu/src/it/chalmers/tendu/gamemodel/GameId.java
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git into Majormerge
Refactoring
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git
into Majormerge

Conflicts:
	Tendu/src/it/chalmers/tendu/screens/ShapesGameScreen.java
Locked shapes no longer triggers wrong placement when attempting to drag
them
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git
into Majormerge

Conflicts:
	Tendu/src/it/chalmers/tendu/gamemodel/GameId.java
players render ok
Merge branch 'Majormerge' of https://github.com/tortal/IT2-LP1-Tendu.git into Majormerge
ShapeGameModelController changes the "right" objects.