added new animal
new animals
Marseille youhou
deleted an animal
new animal
new animals
News fish
new villes
neuws pokemon
Merge branch 'europe'
Merge branch 'birds'

Conflicts:
	animals.txt
Merge branch 'fish'

Conflicts:
	animals.txt