styling footer, header
fixed merge conflict