edit2
Merge branch 'master' of https://github.com/408043749/demo1
merge
Conflicts:
	t1.txt