Merge branch 'master' of https://github.com/SebastianKG/zoo
Merge branch 'master' of https://github.com/SebastianKG/zoo

"adding Seb's commits"
Merge branch 'master' of https://github.com/SebastianKG/zoo

"Adding changes from Seb"
added slaughter button to animal table
fix bug with animalquery when user consumes an item
Merge pull request #7 from norrislee/master

Added slaughter button to animal table