pulling
Merge branch 'master' of https://github.com/kfweber/Smart-Zombie

# By bschalich (4) and Ozone3000 (2)
# Via bschalich
* 'master' of https://github.com/kfweber/Smart-Zombie:
  fasdf
  kjlj
  changed city image again
  Zombie collision detection, expanded city image
  Stairs
  nothing at all

Conflicts:
	MyWorld.class
	project.greenfoot