commit
for git ignore
Merge branch 'master' of https://github.com/wusir27/generator

Conflicts:
	.gitignore