Added deadly skills
Added rebase
Merging in deadly_skills