final updated working version
fixing final version conflicts
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
resolving the conflictand proplems with order class
trying to solve another ones conflict
final updates on item
Merge branch 'master' of https://github.com/DevYah/smartsoft-14 into T3_MahmoudWalid_3.2
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
Merge branch 'master' of https://github.com/DevYah/smartsoft-14 into T3_MahmoudWalid_3.2
Merge pull request #136 from DevYah/T3_MahmoudWalid_3.2

T3 mahmoud walid 3.2
Merge pull request #134 from DevYah/T5_mahmoudeldesouky_5.9

resolving the conflictand proplems with order class
re-resolving error in controller
Merge pull request #140 from DevYah/T5_mahmoudeldesouky_5.9

re-resolving error in controller
please review and merge