fixed too much already -.-
Merge branch 'master' of https://github.com/Project42/ZandzakGame

Conflicts:
	Player.java
	Water.java
	project.greenfoot