qww
delete
s
Merge branch 'master'

Conflicts:
	New Text Document.txt