my 2 changes

my 2 changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	myfile1.txt