MERGING
Merge branch 'new_rules' into deadly_skills

Conflicts:
	dojo_rules.md