Merge branch 'master' into distilled
update color scheme
Ingore SASS cache
Rename SASS folder
Merge branch 'distilled'