add test text

Conflicts:
	folder/test1.txt