nav bar needs fix
fixed conflicts, worked on nav
Merge pull request #46 from russelltaff/fix_merge_conflict

Fix merge conflict