Added new rule about coffee
Fixing markdown
Merge pull request #2 from codeschool-kiddo-level-2-complete/new_rules

Closing from command line
Merge pull request #1 from codeschool-kiddo-level-2-complete/deadly_skills

Merging deadly skills from the command line
Fixed the conflict
Fixed the conflicts issues
Added Killing history using git rebase
Fixed teh conflix after merged