story1 : server and client communication done
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GameWindows/ServerScreen.java
	src/network/MainServer.java