Sass files added
Merge branch 'master' into gh-pages

 - Merge has the sass files