衝突練習!
Merge branch 'master' of https://github.com/Wei789/GitPractice

Conflicts:
	Sample.txt