pulling from wendy
Merge branch 'master' of https://github.com/DrivewayHunt/DrivewayHunt
pushing for jake
remove style.sass and merge changes into style.scss
Merge pull request #46 from taiga418/master

pushing for jake
merge upstream
add semicolons to scss manifest
Merge pull request #47 from GabeMedrash/master

deal with sass/scss issue
merge