Merge pull request #1 from colorbook/master

中文翻譯新增 Merge pull request #1 from colorbook/master
譯者新增
Merge pull request #2 from colorbook/master

中文翻譯新增 Merge pull request #2 from colorbook/master
中文翻譯新增
Merge remote-tracking branch 'upstream/master'