first commit for branch test4
sencond commit for test4
Merge branch 'test4'

Conflicts:
	src/Test1.java
	src/Test2.java
Merge branch 'test4'

Conflicts:
	src/Test1.java
	src/Test2.java