first commit
some changes to test continuous delivery
Edem updatet the logistic page and the landing page
minimum change
merge conflict resolved