Ens
JADÅ
SHIT
kom igen nu då
Merge branch 'master' of
https://github.com/Freddeg/Eda040---Projektet.git

Conflicts:
	bin/Client/ImageHandler.class
	bin/Client/MonitorBuffer.class
	bin/Server/In.class
	src/Server/Server.java