add resource lock
Merge branch 'master' of https://github.com/benPearce1/kvstore

Conflicts:
	server.js