Merge branch 'deadly_skills'

Conflicts:
dojo_rules.md
introduction.md