lockingtest2 passes
Merge pull request #29 from lyeary/master

mergggee
Merge pull request #30 from lyeary/master

evict passing and ready to merge
Merge pull request #11 from farahfouladi/master

merge finally t god