cleaning up textures
Merge branch 'master' of github.com:ethanmn/CPE476Final
flowers are textured, water texture deleted because not needed