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

Conflicts:
	6.txt
Merge pull request #3 from JinoLi/master

6