Merge pull request #1 from msanders218/deadly_skills

pull req 2
Merge branch 'master' into deadly_skills