worked on centering footer
fixed merge conflict
finished footer
fixed merge conflict