Fix any problems
Merge branch 'Zoo_class' of github.com:AlexanderTankov/Zoo-Problem into Zoo_class

Conflicts:
	zoo.py