888 line add
Merge https://github.com/vyx02237/hellowworld

Conflicts:
	6.txt
衝突解除