Navbar for Week 2
layout partials and changes for office hours
Merge branch 'dev'

Conflicts:
	app/layout_partials/_navbar.php

merge conflicts
updates
layout fix
Merge branch 'dev'