Added .sass-cache to .gitignore
Merge remote-tracking branch 'origin/master'