all of problem 1 working. needed: style+comments
Merge branch 'master' of github.com:WillChilds-Klein/Locking-OCC

Conflicts:
	bin/txn/lock_manager_test
	bin/txn/txn_processor_test
	obj/txn/lock_manager.o
	obj/txn/lock_manager_test.o