修改了颜色
Merge branch 'master' of https://github.com/New-Begin/2048-android.git

Conflicts:
	src/com/newbegin/android_2048/Card.java
修改了合并填充函数在游戏结束后调用的返回ture的bug