Merge pull request #38 from wangxiao/master

待提测
Modified portal intro wording
Merge pull request #39 from windyarts/master

Wording modification
Merge branch 'master' of https://github.com/wandoulabs/satan
修复样式bug