zoo1 commit step2
Merge branch 'master' of https://github.com/feliperama/zoo

Conflicts:
	animals.txt