Merge pull request #1 from dasarishiv/master

Shiv code merging
Merge pull request #2 from dasarishiv/master

LESS to SASS conversion
Merge pull request #1 from mamillapalle/master

update