working on scss
Merge pull request #18 from ercchy/master

working on scss