Added sass-cache and node_modules to .gitignore
Merged changes