Merge branch 'master' of https://github.com/Walfischfutter/zombiefu
Merge branch 'master' of https://github.com/Walfischfutter/zombiefu
KeyCard
Merge branch 'master' of https://github.com/Walfischfutter/zombiefu
Doors und Keys einlesen
Merge branch 'master' of https://github.com/willerma/zombiefu

Conflicts:
	src/zombiefu/util/ZombieGame.java
Merge branch 'master' of https://github.com/willerma/zombiefu

Conflicts:
	src/zombiefu/itembuilder/KeyCardBuilder.java
	src/zombiefu/util/ZombieGame.java
Merge remote-tracking branch 'walfisch/master'