Merge branch 'master' into texture
Merge branch 'texture' of github.com:Ethanmn/CPE476Final into texture