Scaffold de Producto
Merge branch 'master' of https://github.com/arturocr88/Administrador

Conflicts:
	Administrador/config/routes.rb
	Administrador/db/schema.rb
Merge branch 'master' of https://github.com/arturocr88/Administrador