STarted on OUT-thread on server side mvh oskis
merged
merge lol
Merge branch 'master' of
https://github.com/Freddeg/Eda040---Projektet.git

Conflicts:
	bin/.gitignore
	src/Client/ImageHandler.java
	src/Client/In.java
	src/Server/In.java
	src/Server/Monitor.java
Merge branch 'master' of https://github.com/Freddeg/Eda040---Projektet.git
gg
Merge branch 'master' of https://github.com/Freddeg/Eda040---Projektet.git
server changes
Merge branch 'master' of https://github.com/Freddeg/Eda040---Projektet.git
updates server
Merge branch 'master' of https://github.com/Freddeg/Eda040---Projektet.git