Updated version
Clear
Merge branch 'master' of https://github.com/mathiasrando/gulp-workflow

Conflicts:
	npm-debug.log