add one animal and one city
add 5 animals
add one city
add one animal
add one animal
add farm animals
add Europe cities
test
test1
test2
test3
test4
test5
testfish
Merge remote-tracking branch 'origin/europe'
Merge branch 'fish'

Conflicts:
	animals.txt
	cities.txt