added rebase in the deadly skills
Merge branch 'deadly_skills'