implementado crud de tarjetas de servicio
Merge branch 'master' into cruz

Conflicts:
	views/sindicato/ver_sindicato.erb
revisa el metodo modificar no funciona para nada
Merge branch 'cruz'
Merge branch 'Uchija'
modificado
Merge branch 'master' of https://github.com/cruzbasco/SistemaGeneradorDePagos
Merge branch 'master' into Uchija

Conflicts:
	views/sindicato/ver_sindicato.erb