Merge pull request #20 from lisafrench/master

Changes to make more modular CSS. Also moving to gem that supports sass.
Merge remote-tracking branch 'upstream/master'