ignores .sass-cache
Merge branch 'master' of github.com:olistik/xghost
Merge remote-tracking branch 'upstream/master'