added clint's css header changes again because it broke everything to remove them.
Merge branch 'magnum-308-theme-october' of https://github.com/DellGDC/sherpa into magnum-308-theme-october

Conflicts:
	assets/css/magnum.css