Message

Message
Merge branch 'master' of https://github.com/CrocusJava/battleofrotterdam

Conflicts:
	TESTCOMMIT.txt