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

Conflicts:
	test.java