Merge pull request #1 from codeschool-kiddo-level-2-complete/master

Test
Merge pull request #2 from munsy65/deadly_skills

Merge pull request #1 from codeschool-kiddo-level-2-complete/master