Bulletproofing the clientside connection logic.
Solve merge conflict

Conflicts:
	src/edu/csf/client/GameGUI.java