Corrección
Merge branch 'master' of https://github.com/andragons2/Get-It-Saving

Conflicts:
	res/layout/activity_ingreso.xml
	src/eafitedu/gis/Ingreso.java