Merge pull request #1 from Angelfirenze/master

Completion
Merge pull request #2 from Angelfirenze/deadly_skills

Merge pull request #1 from Angelfirenze/master