change log
Merge branch 'master' of https://github.com/GoGitZKQ/TestGitHub.git

Conflicts:
	TestJave/src/Test.java