hej
laal
Merge branch 'master' of github.com:TBthegr81/Grupp5Chat

Conflicts:
	src/Server/ChatProtocol.java
	src/Server/Main.java
	src/Server/ServerThread.java
here goes nothing