Branch Eric
Merge branch 'eric'

Conflicts:
	kz/java/Main.java