commit!
commit
commit3
1
Merge remote-tracking branch 'origin/master'

Conflicts:
	SampleJava/src/kbc/jinma/kazuhiro/Main.java