conf6
Merge branch 'master' of https://github.com/igromskyy/TestBranchGit.git

Conflicts:
	TestBranchGit/src/pac1/Class1.java