redid navbar
Merge pull request #3 from annabeldunstone/nav

redid navbar