navbar change
Merge branch 'master' of https://github.com/ikitha/Project_2