MM1
Merge branch 'master' of https://github.com/gimslab/gitest0624.git

Conflicts:
	src/Test.java
master 1
Merge branch 'master' into br4

Conflicts:
	src/Test.java