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

Conflicts:
	Grupparbete/src/chatclient/Client.java