commit
commit
commit
commit
Merge branch 'copy1' into copy2

Conflicts:
	data2.txt
Merge branch 'master' of https://github.com/lbel11l/test-repo