TestCommit
Merge branch 'master' of https://github.com/Mythli/monopoly-schlossalee

Conflicts:
	src/monopoly/.gitignore
Test
Merge branch 'master' of https://github.com/Mythli/monopoly-schlossalee