added nav bar
Merge branch 'master' of https://github.com/catherinev/OurProject into layout_nav
this should add whatever i added
Merge pull request #6 from catherinev/layout_nav

Layout nav