added deer_butt.dae
Merge branch 'master' of https://github.com/Ethanmn/CPE476Final
fixed some minor issues with compilation
Merge branch 'master' into texture