Generische Waffen + Kleinkram
Zombies
Merge remote-tracking branch 'walfisch/master'
Merge remote-tracking branch 'max/master'

Conflicts:
	src/zombiefu/level/Level.java