working on nav bar
Merge branch 'master' into navBar
made a top bar and nav bar
undid a change I made
added logout button and overview tab
added partial
navbar is displaying now
Merge branch 'master' into navBar
fixing orbit problem
small changes to make the tabs work properly
Merge pull request #90 from CSc436/navBar

Made the navigation bars
Merge pull request #91 from CSc436/fixHome

fixing orbit problem
Merge branch 'master' into inforpage

Conflicts:
	site/app/partials/_nav.html