changing introduction file for the deadly skills branch
adding 'Killing history using git rebase' as deadly skill
Added new rule about coffee
Merge branch 'new_rules' of https://github.com/mechdeveloper/dojo_rules into new_rules
fixing errors (codeschool task)
Merge pull request #2 from mechdeveloper/new_rules

Too many people are spilling coffee