borrando listado.java
Merge branch 'Alternativo' of https://github.com/loxosceles/UNAM-Programacion_Avanzada into Alternativo

Conflicts:
	proyecto-4_java/src/project4.java
Merge branch 'Alternativo' of https://github.com/loxosceles/UNAM-Programacion_Avanzada into Alternativo

Conflicts:
	proyecto-4_java/src/project4.java