edit by 5271
edit by 5271
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.txt
Merge branch 'master' of github.com:pshizhsysu/mygithub