fixed waterfall
Merge branch 'master' of https://github.com/horsman/pegjam2014
Title
Merge branch 'master' of https://github.com/horsman/pegjam2014

Conflicts:
	pegjam2014/Assets/StartScene.unity