initial commit
Merge branch 'master' of https://github.com/alxs24/generator-ember-gulp

Conflicts:
	.gitignore