fixed some stuff
Merge branch 'master' of https://github.com/Project42/ZandzakGame

Conflicts:
	Water.java
	project.greenfoot