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

Conflicts:
	test.java
Merge branch 'JonathanPrall-patch-1'