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

Conflicts:
	kz/java/Main.java
Merge branch 'eric'
Edit by master
Merge branch 'eric'

Conflicts:
	kz/java/Main.java
	modified:   kz/java/Main.java