updating with master for deployment
updating and merge conflict
adding product page
removed product
src