老提交2
Merge branch 'master' of https://github.com/sonicfigo/git_sample1.git

Conflicts:
	note1.txt