Fix merge conflicts
fixed footer on all the pages
Fix merge conflicts
Fixed facebook buttons on all the pages