Added new rule about coffee
Merge branch 'new_rules' of github.com:MarneeDear/dojo_rules into new_rules
fixed dojo rules
Merge pull request #2 from MarneeDear/new_rules

Too many people are spilling coffee
Merge pull request #3 from MarneeDear/master

merge deadly skills with master?