Updated documentation
Merge branch 'sass' into gh-pages