Эксперимент
Эксперимент 2
master изменение
Merge remote-tracking branch 'origin/test'

Conflicts:
	src/test/java/ResumeTest.java
int a = 3;
Merge remote-tracking branch 'origin/master' into irvind

Conflicts:
	src/test/java/ResumeTest.java