check
Merge branch 'master' of https://github.com/vali91x/PartyAlias

Conflicts:
	bin/PartyAlias.apk
	bin/classes.dex
	bin/classes/com/example/partyalias/GameBoard.class
	bin/classes/com/example/partyalias/PlayGame$1.class
	bin/classes/com/example/partyalias/PlayGame$2.class
	bin/classes/com/example/partyalias/PlayGame$3.class
	bin/classes/com/example/partyalias/PlayGame.class
	bin/classes/com/example/partyalias/R$id.class
	bin/classes/com/example/partyalias/StartActivity.class
	bin/classes/com/example/partyalias/StartGame1$list1.class
	bin/classes/com/example/partyalias/StartGame1$list2.class
	bin/classes/com/example/partyalias/StartGame1$list3.class
	bin/classes/com/example/partyalias/StartGame1.class
	bin/classes/com/example/partyalias/StartGame2$1.class
	bin/classes/com/example/partyalias/StartGame2$10.class
	bin/classes/com/example/partyalias/StartGame2$11.class
	bin/classes/com/example/partyalias/StartGame2$12.class
	bin/classes/com/example/partyalias/StartGame2$13.class
	bin/classes/com/example/partyalias/StartGame2$2.class
	bin/classes/com/example/partyalias/StartGame2$3.class
	bin/classes/com/example/partyalias/StartGame2$4.class
	bin/classes/com/example/partyalias/StartGame2$5.class
	bin/classes/com/example/partyalias/StartGame2$6.class
	bin/classes/com/example/partyalias/StartGame2$7.class
	bin/classes/com/example/partyalias/StartGame2$8.class
	bin/classes/com/example/partyalias/StartGame2$9.class
	bin/classes/com/example/partyalias/StartGame2.class
	bin/classes/com/example/partyalias/gameSettings.class
	bin/resources.ap_
	gen/com/example/partyalias/R.java
	src/com/example/partyalias/gameSettings.java