git init
init
Merge branch 'master' of https://github.com/yuyinsl/python-WolfKiller

Conflicts:
	.gitignore