galin ordered 醇香咖啡
Merge branch 'gh-pages' of https://github.com/scau-sidc/git-tutorial.git into gh-pages

Conflicts:
	experiment/Tea元素.txt
demonstrate pull request
demonstrate pull request.
Merge pull request #1 from scau-sidc/galin

This PR can be merge automatically. So I merge it on Github, rather than doing that on my machine.