add function test3()
Merge remote-tracking branch 'origin/master' into master1

Conflicts:
	src/com/example/git_test/C.java