antes de cagarla
chupala mieldagit status
Merge branch 'salvatajebancario'

Conflicts:
	app.js
	public/js/index.js