add func2 function without implementation
Merge remote-tracking branch 'origin/master'

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