Change-Id: I2f93c6a9f48bed65c1250be140d27b297e6b6b99
Signed-off-by: User1 <user1@text.org>
Es kann geflirtet werden ! 

Change-Id: Idbc77d30cc98f8adeb8542c15e1a4345dc41e24e
Signed-off-by: Sebastian + Raffael <user1@text.org>
Merge remote-tracking branch 'origin/master'

So Jungs, hoffentlich klappt's ! 
Habe ein wenig gemerged ! 

Conflicts:
	src/main/GameLogic.java
	src/player/Human.java