Some slight modifications in header
Merge branch 'headerFooter' into develop

Conflicts:
	css/style.css