fist commit for master
first commit for branch test4
second commit test2
sencond commit for test4
Merge branch 'test4'

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

Conflicts:
	src/Test1.java
	src/Test2.java
new added file 3 and modified in test1.java
merged branch 3 changes