hello
Merge branch 'deadly_skills'

* deadly_skills:
  hello

Conflicts:
	dojo_rules.md