added import json to zoo.py
Merge branch 'master' of github.com:emilenovv/ZooTeamwork
Added changes to function eat in animal.py in addition with database.jason
Merge branch 'master' of github.com:emilenovv/ZooTeamwork

Conflicts:
	animal.py
	zoo_test.py
changed function eat in animal.py in addition with database.json