Add Skills
Add rebase comment per codeschool-kiddo's comment
Merge branch 'deadly_skills'