switched rain mesh from box to rain, added rain texture
Merge branch 'master' into deferredLighting
Trying to make est. shot smooth.
Merge branch 'master' of https://github.com/ethanmn/CPE476Final
added flower textures
Merge branch 'master' of https://github.com/Ethanmn/CPE476Final
cleaning up textures
Merge branch 'master' of github.com:ethanmn/CPE476Final
flowers are textured, water texture deleted because not needed
Merge branch 'master' into deferredLighting