a
Merge branch 'master' of ssh://github.com/RobzInadE/Grupp
Merge branch 'master' of ssh://github.com/RobzInadE/Grupp

Conflicts:
	Grupparbete/src/chatclient/Client.java
q
Merge branch 'master' of ssh://github.com/RobzInadE/Grupp
Merge branch 'master' of ssh://github.com/RobzInadE/Grupp
Merge branch 'master' of ssh://github.com/RobzInadE/Grupp

Conflicts:
	Grupparbete/src/chatclient/Client.java
changed closing window method - now it closes client before terminating program
Merge branch 'master' of ssh://github.com/RobzInadE/Grupp