nothing
Merge branch 'master' of git@github.com:New-Begin/2048-android.git

Conflicts:
	src/com/newbegin/android_2048/GameManagerActivity.java
Merge branch 'master' of git@github.com:New-Begin/2048-android.git

Conflicts:
	src/com/newbegin/android_2048/GameLayout.java
	src/com/newbegin/android_2048/GameManagerActivity.java