Header and nav
Merge branch 'master' of https://github.com/KatAviles/art336-final-designer-observer

Conflicts:
	index.html
	js/plugins.js