Turning header and footer into includes.
Merge remote-tracking branch 'origin/master'