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

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