Update Client.java
Update GUI.java
Merge pull request #16 from FrischePeterSilie/patch-2

Update GUI.java
Merge pull request #15 from FrischePeterSilie/patch-1

Update Client.java
Merge pull request #17 from kminhc/TobiasBranch

Tobias branch