...
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/logik/Karte.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/logik/Karte.java