Merge pull request #2 from BrianAlan/master

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

Conflicts:
	TestJave/src/Test.java
Merge pull request #2 from GoGitZKQ/master

add log form you