Minor edit to file 1
Commit
Merge branch 'editing-file-1'

Conflicts:
	file1.txt