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

# By bschalich
# Via bschalich
* 'master' of https://github.com/kfweber/Smart-Zombie:
  damnit
  fixed jump movement
  i fucked up again
  i fucked up

Conflicts:
	project.greenfoot