Grid errors fixed
Merge branch 'master' of https://github.com/daniel-hanson/Android-ACM-2048

Conflicts:
	src/com/mizzou/acm/android/Grid.java