Added navbar
Merge branch 'david' of https://github.com/JonMasson/Entropy