s
Merge pull request #113 from DevYah/T5_mahmoudeldesouky_5.9

sprint 0 task 5.9
added the warehouse page of the retailer with liks to all pages
trying to fix
Merge branch 'master' of https://github.com/DevYah/smartsoft-14
trying to solve another ones conflict
Merge pull request #133 from DevYah/T3_samehmetias_3.3

added the warehouse page of the retailer with liks to all pages
re-resolving the conflict