Switched animals for christopherknox and johnzhou on Michelle's request
Merge branch 'master' of github.com:encorelab/evoroom4