updated waterShaping
Merge branch 'master' of https://github.com/neuroneuro15/hippoVR
fixed merge conflict