Merge pull request #10 from meteormatt/master

修改一些小地方
Merge pull request #11 from meteormatt/master

更新进度和贡献者信息
Merge pull request #4 from MozillaChina/master

合并