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

Conflicts:
	bin/classes/com/example/partyalias/R$id.class
	bin/classes/com/example/partyalias/R$layout.class
	bin/classes/com/example/partyalias/R$menu.class
	bin/classes/com/example/partyalias/R$string.class
	bin/classes/com/example/partyalias/StartGame2.class
	gen/com/example/partyalias/R.java