Merge pull request #2 from JinoLi/master

6
6+
Merge remote-tracking branch 'upstream/master'

Conflicts:
	6.txt