Merge pull request #30 from USunOfBeach/master

skill
更新
Merge remote-tracking branch 'origin/master'

Conflicts:
	汉化/tags_skills.txt
Merge pull request #46 from solael/master

update