Added some implementation for Zoo's function and some tests
Fix some merge conflict in zoo
Merge pull request #5 from mimipaskova/zoo-implement

Zoo implement