Moved code around
Added task to compile sass
Set git to ignore .sass-cache folders
Merge commit '657b86f943f25c8fbe18d1bf04bf90662c5314ec' into stripped

Conflicts:
	.gitignore
	node_modules/grunt-contrib-sass/.jshintrc
	node_modules/grunt-contrib-sass/CHANGELOG
	node_modules/grunt-contrib-sass/Gruntfile.js
	node_modules/grunt-contrib-sass/README.md
	node_modules/grunt-contrib-sass/docs/sass-examples.md
	node_modules/grunt-contrib-sass/docs/sass-options.md
	node_modules/grunt-contrib-sass/docs/sass-overview.md
	node_modules/grunt-contrib-sass/package.json
	node_modules/grunt-contrib-sass/tasks/sass.js
Reinstalled sass module
Testing watch; works smoothly