Navbar + pagez

Navbar is now functional
all pages are up
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html