quotes
nav bar
fixed quote
blog implementation
Merge branch 'nav-bar'

Conflicts:
	style.css