lab 3
Merge branch 'lab2' into lab3

Conflicts:
	kv_client.cc
	kv_client.h
	kv_server.h