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

Conflicts:
	src/monopoly/GameBoard.java
	src/monopoly/Monopoly.java