added text
Merge branch 'edit_file1'

Conflicts:
	file1.txt