wtf
out added
asd
ihihi
fix
server refactor
Merge branch 'master' of
https://github.com/Freddeg/Eda040---Projektet.git

Conflicts:
	src/Client/ImageHandler.java
Merge branch 'master' of https://github.com/Freddeg/Eda040---Projektet.git
hoh
k
server gg osv
Merge branch 'master' of https://github.com/Freddeg/Eda040---Projektet.git
Ens
JADÅ
SHIT
minor server changes
hiho
Merge branch 'master' of https://github.com/Freddeg/Eda040---Projektet.git
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
red removed