Merge branch 'deadly_skills'
Merge branch 'master' of https://github.com/sd84/dojo_rules