lastest change
Merge branch 'master' of https://github.com/mashimaroa15/testJava

Conflicts:
	src/test/Test.java