integrate scss navbar
addpages+navbar
fixconflict
Merge branch 'master' into add-pages

fix
Merge branch 'master' of github.com:Matthieuuuu/indus
realfixing
Merge pull request #6 from Matthieuuuu/add-pages

Add pages