moved to sass
fixed conflicts
Bumped up major version number
Updated readme