deadly_skills
killing rebase
Merge branch 'deadly_skills'

Conflicts:
	introduction.md