branch3
Merge branch 'branch3'

Conflicts:
	src/git_sample/test.java