4
Merge branch 'master' of
https://github.com/HannaTsybulskaya/testRepo.git

Conflicts:
	testProject/src/main/java/Run.java