fix conf
Merge branch 'c1' of https://github.com/igromskyy/TetsBranch2.git into
c1

Conflicts:
	TetsBranch2/src/pac1/Cl2.java