Fixed Connect to Server GUI
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/finalProject/Client/Client.java
	src/finalProject/GUI/game/GameUI.java