Merge pull request #4 from mimipaskova/zoo-implement

Zoo implement
added a new comments in the animal and zoo
Added some implementation for Zoo's function and some tests
Fix some merge conflict in zoo