nn
hihiMerge branch 'master' of
https://github.com/Freddeg/Eda040---Projektet.git

Conflicts:
	src/Client/MonitorBuffer.java
Merge branch 'master' of
https://github.com/Freddeg/Eda040---Projektet.git

Conflicts:
	src/Client/MonitorBuffer.java
d
Merge branch 'master' of
https://github.com/Freddeg/Eda040---Projektet.git

Conflicts:
	src/Client/ImageHandler.java
javadoc for client package