add one animal and one city
add 5 animals
add one city
add one animal
add one animal
add farm animals
checkout2
Merge branch 'fish'

Conflicts:
	animals.txt