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

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