test
test
Merge branch 'master' of github.com:sublime718/cobatte

Conflicts:
	test.java
testMerge branch 'master' of github.com:sublime718/cobatte

Conflicts:
	test.java