le cambio una linea
le cambie otra linea
Merge branch 'master' of https://github.com/darkber/egresos

Conflicts:
	php/nuevo/nuevoUpp.php