Initial kill list
Initial Deadly Skills
Rebase
rebase
Merge branch 'new_rules' of https://github.com/kenp11/dojo_rules into deadly_skills

Conflicts:
	introduction.md
Coffee
dojo
dojo
Merge branch 'deadly_skills'

Conflicts:
	dojo_rules.md
	introduction.md