Update to SASS
Merge branch 'master' of https://github.com/HolisticDesigns/scratch

Conflicts:
	README.md