修改合并填充bug
Merge branch 'master' of https://github.com/New-Begin/2048-android.git