added contrib-sass and contrib-watch to grunt
Merge branch 'master' of github.com:nusskugeldingsi/picolo

Conflicts:
	assets/css/custom-styles.css
	assets/css/styles.css