测试内容
Merge branch 'master' of github.com:wolfxi/2048

Conflicts:
	README.md