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

Conflicts:
	test.java
Merge branch 'quaz450-patch-2'