Removed welcome.css.scss and scaffolds.css.scss
Pulled from master in Github. Didn't do any changes
Merge branch 'stylefix'