Sass restructure
Fixed merge error
Final merge fixes
Merge pull request #25 from bnhovde/master

SASS Restructure