I am unsure what these changes are. I may have forgotten to push for the last milestone
Fixed Conflicts in contentPage.css