还是用英文句号吧
Merge branch 'master' of github.com:chaifeng/flaming-computing-machine

Conflicts:
	README.md