actualizacion
Merge branch 'master' of https://github.com/rikimm/boletosGit

Conflicts:
	config/usuarios.json