Tried more testing and failing
Merge branch 'master' of https://github.com/samirarabbanian/chaturaji

Conflicts:
	chaturaji-android-app-test/src/ac/ic/chaturaji/android/GameActivityTest.java