Add an animal and a city
Add 5 animals and a city
Prepend and append an animal
Add some animals
Add some fishes
Add European cities
Merge branch 'europe'
Merge branch 'fish'

Conflicts:
	animals.txt