Kommentarer boyakasha ma homies. Det där med heil var inte meningen.
Sorry / JImmy
eee
Merge branch 'master' of
https://github.com/Freddeg/Eda040---Projektet.git

Conflicts:
	src/Client/ClientTestMain.java
	src/Client/GUI.java
	src/Server/Out.java
	src/protocol/ImageContainer.java