Beginning Revamp of website, taking out slider views
resolved merge conflict