updating locking
remove some debugs
some renaming
Merge branch 'master' of https://github.com/clarkkev/451-project-3

Conflicts:
	undelete.c