product list
Merge branch 'master' of https://github.com/prokhatskiy/ecom_app

Conflicts:
	css/styles.css
	js/UI.js
	scss/styles.scss