added header and footer
fix merge
fix merge 2
fix merge 3
Merge pull request #104 from RoanKanninga/master

Updated header and footer