Vet ej
Merge branch 'master' of
https://github.com/Freddeg/Eda040---Projektet.git

Conflicts:
	src/Client/ClientTestMain.java
Merge branch 'master' of https://github.com/Freddeg/Eda040---Projektet.git
shit
Merge branch 'master' of https://github.com/Freddeg/Eda040---Projektet.git
inget viktigt
ENS

Merge branch 'master' of
https://github.com/Freddeg/Eda040---Projektet.git

Conflicts:
	src/Client/ClientTestMain.java
	src/Server/Server.java
fixes