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

Conflicts:
	src/screens/server/ConnectedPlayersScreen.java

	melanie,manigann
made changes in imagepanel and mainframe
	melanie,manigann
made changes in mainframe and imagepanel|manigann,melaniem
Merge branch 'master' of https://github.com/AbhilashTw/Mafia

Conflicts:
	src/channels/SocketChannel.java
	src/screens/client/VillagerScreen.java
	src/screens/controls/MainFrame.java
displayed players name on each screen|manigann,melaniem