fixed error in main.scss
Merge remote-tracking branch 'origin/master'