fix conflict
9
Merge branch 'master' of github.com:kgd-zhen/pro

Conflicts:
	readme.txt