reverted main.scss
Merge branch 'working-branch'
Merge branch 'master' into gh-pages