Added 1 city and 1 animal
Added 5 animals
Added 1 city
Added a monster
Added Bonbons
Added a Fox
Added Bouboule
Deleted bouboule
Added Bouboule
Added Quebec
Merge branch 'farm'
Merge branch 'europe'
Merged manually