Merge branch 'header-footer'

Conflicts:
	css/style.css