anyway
Merge branch 'master' of https://github.com/YuanLiou/FirstTry

Conflicts:
	textfile.txt