Haeh
Merge branch 'master' of
https://github.com/HeikeHerzog/mittelalterspiel.git

Conflicts:
	src/Test.java