Update Test.java
Merge remote-tracking branch 'origin/b1'

Conflicts:
	src/Test.java