sgsdg
Merge branch 'master' of https://github.com/kidul/dameproject.git

Conflicts:
	DameKI/src/match/Game.java