add func5 to C.java
add func4 to C.java
Merge remote-tracking branch 'origin/master'

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