Clean scss
Merge branch 'master' of https://github.com/salahwaisi/boilerplate