added rebase
rerge branch 'deadly_skills'