modified:   kz/java/Main.java
Merge branch 'master' of https://github.com/eskater/java

Conflicts:
	kz/java/Main.java