new comments
Merge branch 'master' of https://github.com/usoluyun/gyjt_yushu

Conflicts:
	setup.py