Pulling from upstream
Pulling from upstream
Converted sass to scss
Merge pull request #17 from chrisdfe/master

Converted sass to scss