database changed
Merge branch 'master' of github.com:LachezarStoev/Zoo
zoo tests done
conflicts resolved