动画效果
Merge branch 'master' of https://github.com/firegames/test

Conflicts:
	2048/Category/UIView+Animation.m
	2048/Class/View/GameView.m

缺少的文件暂时注释掉了