new commit
Merge branch 'master' of https://github.com/Peter-PK-Kuang/Sample-Project

Conflicts:
	Sample.txt