Merge pull request #11 from DSegal92/gh-pages

Updated features slider
Merge branch 'gh-pages' of https://github.com/vigilant/marketing-site into gh-pages
collapsed all CSS into styles.css file