一旦コミット
Merge branch 'master' of https://github.com/cutupworks/gulp

Conflicts:
	gulpfile.js