* add ignore settings.
Merge branch 'master' of github.com:xirang/chanzhieps

Conflicts:
	.gitignore