Add deadly skills
Add skill killing history
Correct coffee and dojo
Merge branch 'deadly_skills'