Added logo to navbar
Merge conflict