fixed water shader on mac.
Flower mesh now instead of deer, flowers now level with ground at that position
Merge branch 'master' of github.com:ethanmn/CPE476Final