server impl modification
Merge branch 'master' of https://github.com/Myhall/PA165_DeliveryService.git