Implemented pt 6
Merge branch 'yong' into james

Conflicts:
	src/edu/berkeley/cs162/KVCache.java
	src/edu/berkeley/cs162/KVServer.java