+
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gui/bilder/BildBauer.java
	src/logik/Spieler.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	src/gui/bilder/BildBauer.java
	src/logik/Spieler.java