Update introduction.md
Update introduction.md
commited
merge
merge
Added new rule about coffee
Merge branch 'new_rules' of https://github.com/junhua/dojo_rules into new_rules

Conflicts:
	introduction.md
added intro
Update dojo_rules.md
Merge pull request #2 from junhua/new_rules

Too many people are spilling coffee