Revert "new commit 2"

This reverts commit e627925f1790338b28b37cce5701196c30314c41.

Conflicts:
	myfile3.txt
new commit 4
new commit 5