m
Merge branch 'lobby' of https://github.com/tortal/IT2-LP1-Tendu.git into
lobby

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