added deadly skills
added rebase
Merging in deadly_skills