animals view changes
Merge branch 'master' of https://github.com/RitaDallara/zoo

Conflicts:
db/development.sqlite3
log/development.log
commit