ignore .sass-cache
Update .gitignore
Merge branch 'master' into dev