merging
Merge branch 'lock_store' of https://github.com/havellay/ADBMS_ABY into lock_store