fixed spacing in html
Merge branch 'sass' into gh-pages
fixing merge conflict