codeschool 2.2
responded to comment
Merge branch 'deadly_skills'