commit
commit
commit
commit

Conflicts:
	data2.txt