Color tinting and water movement with O and P.
Merge branch 'Water' of https://github.com/brickman1444/Waterline into Water

Conflicts:
	Assets/Scenes/waterline.unity