words appened

ici plus de detail sur le commit
juste animals.txt
juste cities.txt
poule
dragon
changes in fish
changes in farm
changes in europe
Merge branch 'europe'
merged with conflicted