StrongParams => Articulos
StrongParams => Clientes
StrongParams => Documentos
StrongParams => Feedback - PassReset
StrongParams => Usuarios - Turnos
StrongParams => Pagos - Créditos
StrongParams => Etiquetas
StrongParams => Tipos impresión
StrongParams => Ordenes
StrongParams => Impresiones
Turbolinkeando lo básico
Turbolinks => precios
Turbolinks => Catálogo,Datepicker,Feedback
Turbolinks => Clientes, documentos
Turbolinks => Impresiones
Turbolinks => Ordenes
Merge branch 'turbolinks'
Merge branch 'strong_params'

Conflicts:
	Gemfile
	Gemfile.lock
	test/integration/customers_test.rb