css commit
Merge branch 'master' of https://github.com/Nareah/shop

Conflicts:
	app/assets/stylesheets/products.css.scss