Merge pull request #7 from MozillaChina/master

上游合并
Merge branch 'master' of github.com:MozillaChina/firefoxos-quick-guide
Merge pull request #8 from MozillaChina/master

上游合并
Merge branch 'master' of github.com:meteormatt/firefoxos-quick-guide
增加项目作者