products
Merge branch 'master' of https://github.com/Aleksandrova/html

Conflicts:
	api/products.json