B3-1
B3-2
B3-3
Merge branch 'master' of https://github.com/gimslab/gitest0624.git

Conflicts:
	src/Test.java