client with part of its connection active
makefile added
Merge remote branch 'origin'

Conflicts:
	memory/makefile