#18 Etude barre de navigation
Merge conflict