Merge branch 'deadly_skills' into new_rules
Merge branch 'new_rules'