Commit on int 2
Commit in int2
Merge branch 'master' into int2
One more commit
Merge branch 'master' into int2

Conflicts:
	test2.txt
Merge branch 'int2'