branch02 commit
Merge branch 'branch02'

Conflicts:
	git_test/bin/gitTest.class
	git_test/src/gitTest.java