upgrading sass slide
duplicate changes from github.com repo to umn repo
Resolved conflicts.