don't know what I've changed
Merge branch 'master' of https://github.com/scwe/cluedo

Conflicts:
	src/Cluedo.java