主账户提交
Merge branch 'master' of https://github.com/lijian17/2048

Conflicts:
	t/test.txt