moved waterShapingPattern.py to correct folder.
modified script a bit
Merge branch 'master' of https://github.com/neuroneuro15/hippoVR
Merge branch 'master' of https://github.com/neuroneuro15/hippoVR
new qt stuff
fixed merge conflict
Merge branch 'master' of https://github.com/neuroneuro15/hippoVR
fixed
fixed pull merge conflict
turning mesh lighting off now still applies texture.