finished stuffed animal prop

it now has blendshapes to modify the ear shape!
trying to fix merge conflict
Merge branch 'master' of https://github.com/CNM190/Nightmare