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