This water works for Peter
Merge branch 'dev' of https://github.com/pbjuhr/AntiTowerDefence into dev

Conflicts:
	src/terrain/Water.java