x1 commit
x2 commit
Merge branch 'x2'

Conflicts:
	TetsBranch2/src/pac2/Cl4.java
Merge branch 'master' of https://github.com/igromskyy/TetsBranch2.git