hello
Merge branch 'master' of https://github.com/amin1285/courseproject2

Conflicts:
	product pages/productinfo10.html
	product pages/productinfo2.html