almost done with nav
Merge pull request #38 from kraftery/NewNewDavid

almost done with nav