shop page created, items added
add images to shop
merge master and shop