merge request
Merge branch 'deadly_skills' of https://github.com/sammeta78/dojo_rules into deadly_skills