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