close my ShiT
Merge branch 'master' of git@github.com:Daveiac/FProj_Gruppe48.git

Conflicts:
	KTN2/src/no/ntnu/fp/net/co/ConnectionImpl.java
fixed conflicts yo mofo