working on footer
Merge branch 'dev1'