Merge pull request #2 from SacredMo/master

[SacredMo]
[livefun]
新增tag
Merge branch 'master' of https://github.com/livefun/parchment
Merge pull request #1 from livefun/master

[SacredMo]