remove

removeremoveremove
Merge remote-tracking branch 'origin/xinqiang.wang'

Conflicts:
	user.txt