master 3
master 4
myBranch 3
Merge branch 'myBranch1' of github.com:redarc/GitTest into myBranch1

Conflicts:
	mycommit.txt