Add sass

doh! this is why i'm wondering if there is a way to check for conflicts after we've already merged.