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

Conflicts:
	Tendu/src/it/chalmers/tendu/Tendu.java
	Tendu/src/it/chalmers/tendu/gamemodel/MiniGame.java