Added new rule about coffee
see changes
Merge branch 'deadly_skills'