navbar joy
Merge pull request #3 from daveyk535/navbar

Navbar
Merged navbar w master