still working on item page
merging conflicts
added link to logo
small changes to UI
added images to the suggested product
final ouches for board meeting
added featured shops
added a logo to the merchant login page to make it look official
I changed the height of the carousel image to 700px, changed the width to auto so the image does not stretch.
I changed the background color of the carousel caption so it is easy on the eyes.