Add sass

Oops, you checked in merge conflict.  Did you need to resolve this still?