Converted to Sass
Merge branch 'sass' into gh-pages
Updated to new layout