first commit
Merge branch 'master' of https://github.com/Naxus28/sassycompass into gh-pages
conflict resolved
Merge branch 'gh-pages' of https://github.com/Naxus28/sassycompass into gh-pages