add: add compass gulp plugin to package.json
Merge branch 'master' into variable

Conflicts:
	origin/sass.scss