navbar added with partials
conflicts resolved
Merge pull request #26 from lalogf/master

navbar added with partials