modify by develper2
Merge branch 'master' of https://github.com/PengCX/GitTest

Conflicts:
	test.rb