完成主要功能
Merge branch 'master' of https://github.com/ccy0815ccy/my2048