Update test.java
Merge branch 'patch-1' of https://github.com/rtracey07/JAVAFUNCOMP

Conflicts:
	test.java