added skills
added rebasey
manual merge
Merge branch 'deadly_skills'