Added skills
Added rebase to my list
Fixed conflict
Merge branch 'deadly_skills'