c1
c1-2
c1-3
c1-4
c1-5
fix conf
Merge branch 'c1' of https://github.com/igromskyy/TetsBranch2.git into
c1

Conflicts:
	TetsBranch2/src/pac1/Cl2.java
c1-7
c1-8
Merge branch 'c1' of https://github.com/igromskyy/TetsBranch2.git into
c1

Conflicts:
	TetsBranch2/src/pac1/Cl2.java
c1-9
c1-10
c1-12
Merge branch 'c1' of https://github.com/igromskyy/TetsBranch2.git into
c1

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

Conflicts:
	TetsBranch2/src/pac1/Cl2.java