Merge pull request #2 from CastielSiren/master

Merge pull request #1 from ShawnHuang/master
trans update
Merge branch 'master' of https://github.com/ShawnHuang/guides
Merge pull request #2 from ShawnHuang/master

Merging before editing