navbar
victor working
trying to settle conflicts
fixing conflicts
Merge pull request #16 from capms/navBar

Nav bar