Added SASS install via ruby gem
Resolve merge conflict