Correction des conflits + navbar
Merge pull request #2 from Goundar/master

Correction des conflits + navbar