added live reload and sass compilation
Merge branch 'master' of https://github.com/FilipStenbeck/grunt-demo

Conflicts:
	Gruntfile.js