Changing header
merge
Updated header and footer. Major changes to custom.css.scss. Prepare for a biiiiig merge....
Merge branch 'style' into develop