add skills
add rebasing
Merging branch 'deadly_skills' without ff