Main method.
Commit 2
Merge branch 'master' of https://github.com/zhlp0125/git_sample.git

Conflicts:
	src/git_sample/test.java
Merge branch 'branch1'
Merge branch 'master' of https://github.com/zhlp0125/git_sample.git