Merge pull request #1 from energee/master

Revert "Skills"
More skills
Merge branch 'deadly_skills'