Merge branch 'master' of https://github.com/AbhilashTw/Mafia

Conflicts:
	src/screens/server/ConnectedPlayersScreen.java

	melanie,manigann
changed the messages|manigann,melaniem
fixed the bugs with mafiaScreen|manigann,sneha