status update
Merge remote-tracking branch 'origin/master'

Conflicts:
	HtwgMonopoly/test/de/htwg/monopoly/entities/PlayerTest.java
ChanceCard and ChanceCardTest created