optimizations
Merge branch 'master' of github.com:bogiebro/cs438-hw2

Conflicts:
	txn/txn_processor.cc