cx
ppp
ooooo
Merge branch 'master' of https://github.com/prob5818/tree

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.jdt.core/3593840063.index
	tee/bin/tt/T1.class
	tee/bin/tt/T2.class
	tee/bin/tt/T3.class
	tee/src/tt/T1.java
	tee/src/tt/T2.java
	tee/src/tt/T3.java