will it work
Merge branch 'dev' of https://github.com/tortal/IT2-LP1-Tendu.git into
dev

Conflicts:
	Tendu/src/it/chalmers/tendu/controllers/NumberGameController.java
	Tendu/src/it/chalmers/tendu/controllers/ShapeGameModelController.java