some irrelevant changes
Merge branch 'origin' of https://github.com/xpesav00/DeliveryService into origin

Conflicts:
	DeliveryService/src/main/java/pa165/deliveryservice/daoImplementation/DeliveryDaoImpl.java
	DeliveryService/src/main/java/pa165/deliveryservice/entity/Delivery.java