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

Conflicts:
	css/styles.css
	index.html
	layouts/index.html