add func6 function by B
add func6 function by B
add  func6 function by A
Merge branch 'master' of https://github.com/Minz-Chan/test.git

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