footer
Merge branch 'master' into Header
Header 1st action
footer 1
footer1 - fixed conflict
Merge remote-tracking branch 'origin/master' into body
Added the <p>