moving the CSS files to intro and adding SCSS
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	js/converter.js