Fixed another small bug
Merge branch 'master' of https://github.com/alexjlockwood/android-2048

Conflicts:
	app/src/main/java/com/shanjackwood/app/GameManager.java