Added preliminary water stuff, updated level to match
Merge branch 'master' of https://github.com/iebaker/game-final-project

Conflicts:
	src/game/GameWorld.java