add java version
master add java version
Merge branch 'experiment'

Conflicts:
	java.java
test merge
Merge branch 'experiment'

Conflicts:
	java.java
for testing merge
Merge branch 'experiment'
for test
test
add bat
Merge branch 'experiment'