Some changes to be done
Merge branch 'master' of github.com:kuskmen/Zoo-project
Cosmetic changes