增加了一个变量
Merge branch 'master' of https://github.com/Hysting/TestGithub.git

Conflicts:
	src/com/example/testgithub/MyClass.java