read/write unfinished
Merge remote-tracking branch 'origin/master'

Conflicts:
	cntest/src/nl/vu/cs/cn/test/ClientServerTest.java