Merge pull request #28 from USunOfBeach/master

s
除了技能和背景故事应该全部完成了
更新
Merge pull request #44 from solael/master

update