ggege
Merge branch 'master' of https://github.com/knitadmin/javatest.git

Conflicts:
	JavaTest/src/Encap.java