yo gulp-webapp
Merge branch 'gulp-webapp'

Conflicts:
	.bowerrc
	.editorconfig
	.gitignore
	.jshintrc
	bower.json
	package.json