x1-1
x1-2
x2-1
x2-2
Merge branch 'x2'

Conflicts:
	TetsBranch2/src/pac2/Cl3.java