Merge branch 'master' of https://github.com/gio-vanni/inpizza

Conflicts:
	app/controllers/products_controller.rb
	db/seeds.rb
Merge branch 'master' of https://github.com/gio-vanni/inpizza