gougang
liutianen
Merge branch 'master3' of github.com:liugang19890719/git_version into master2

Conflicts:
	bbb.txt
	liugang.txt
liugang