d
Create sl.txt
Merge branch 'master' of https://github.com/sshling/test1

Conflicts:
	test.txt