Merge branch 'new_rules' of https://github.com/tangshiping/dojo_rules into deadly_skills
Merge branch 'deadly_skills'