[#18] Keep a puffin
[#18] Feed baboon
[#38] Add a shrew
[close #38] Merge branch 'shrew' into master
[close #18] Merge branch 'puffin' into master