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

Conflicts:
	src/Client/GuiEventProcessor.java
	src/Client/MonitorBuffer.java
Försökerfixa delay
Merge branch 'master' of
https://github.com/Freddeg/Eda040---Projektet.git

Conflicts:
	src/Server/Out.java