fixed merge problems

fixed the site, working on it without github kinda fucked it up. just a
little though, all good now
Footer

Fixed the footer.