m1
m2
m3
Merge branch 'master' of https://github.com/gimslab/gitest0624 into br2

Conflicts:
	src/Test.java