debugging and cleaning
Merge branch 'master' of github.com:aleksanb/fellesprosjektet

Conflicts:
	src/no/ntnu/fp/net/co/ConnectionImpl.java