Beginning Revamp of website, taking out slider views
resolved merge conflict
Merge pull request #3 from austinscchiang/dev

Dev