reverted main.scss
Merge branch 'working-branch'