animals
cities
t
test
fish
polp
Merge branch 'farm'

Conflicts:
	animals.txt
tet