2
m
Merge branch 'branch2'

Conflicts:
	git_test2/bin/gitTest2.class
	git_test2/src/gitTest2.java