merged
Merge branch 'master' of https://github.com/Freddeg/Eda040---Projektet.git
added syso
wtf
Merge branch 'master' of
https://github.com/Freddeg/Eda040---Projektet.git

Conflicts:
	.DS_Store
	src/Client/Client.java
major changes to inputstream read
Merge branch 'master' of
https://github.com/Freddeg/Eda040---Projektet.git

Conflicts:
	src/Client/ClientTestMain.java
	src/Client/In.java
	src/Server/In.java
	src/protocol/PacketParser.java