co new
Merge branch 'master' of github.com:lylyyhb/firstGit

Conflicts:
	new.txt