chat
London
adding words in animals
hello
coq
change cities
Merge branch 'europe'
Merge branch 'fish'

Conflicts:
	animals.txt
conflict update