develper v2.0
Merge branch 'develper-v2.0' of https://github.com/PengCX/GitTest into develper-v2.0

Conflicts:
	test.rb