add navbar functions
Merge branch 'master' into add-navbar

merge pour être à jour
Resolved
Merge branch 'master' into add-navbar

Une mise à jour du master
navbar
Merge branch 'master' into add-navbar

navbar
Merge pull request #18 from martinchenu/add-navbar

Add navbar