footer 1
footer1 - fixed conflict
Merge branch 'master', remote-tracking branch 'origin' into Header
Header 2nd action