长着
Merge branch 'master' of https://github.com/cr2121/hot.git

Conflicts:
	README.md