Deleted .sass-cache
Added gitignore
Merge remote-tracking branch 'upstream/master'