Footer complete
Merge branch 'footer'