NEw
Merge remote-tracking branch 'choose_remote_name/master'
Merged the project with my project
Merge remote-tracking branch 'origin/master'

Conflicts:
	KarpfenGame/src/ch/ilikechickenwings/karpfengame/Entity/WalkZombie.java
	KarpfenGame/src/ch/ilikechickenwings/karpfengame/KarpfenGame.java