Update test.java
Merge branch 'master' of https://github.com/Asmodean1209/JAVAFUNCOMP into Asmodean1209-master

Conflicts:
	test.java
Merge branch 'Asmodean1209-master'