Fix header markup
Change footer (undone)
Change footer markup
Change footer markup, fix merge conflict
Merge pull request #91 from dmitryshilin/change_header_footer_markup

Fix header and footer markup