intro 2
Merge branch 'deadly_skills'

updated info