added navbar with temp menus.
fix merge conflicts
Merge branch 'gabe'