zoo - slon added

(cherry picked from commit 8f86fda7d969c78417a951f22f960b67859c6362)

Conflicts:
	zoo.txt
test2 added, slon modified