c
Merge branch 'master' of github.com:bucciafan/git-practice

Conflicts:
	新建文本文档.txt