add one animal and one city
add 5 animals
add one city
add one animal
add one animal
add farm animals
add fishes
Merge branch 'fish' 2
Conflicts:
	animals.txt