navbar
conflict resolved
Merge pull request #79 from emocentmagar/prachanda

Prachanda