Merge pull request #2 from martytheparty/new_rules

Too many people are spilling coffee