Ham-fisted attempt to merge CSS changes back into the SaSS template.
Merge pull request #4 from slightlyoff/master

Ham-fisted attempt to merge CSS changes back into the SaSS template.