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

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