cambios
Merge branch 'master' of https://github.com/estebanmorales1594/Tarea1

Conflicts:
	Tarea1/src/FiltrarLista.java
	Tarea1/src/Interface.form
	Tarea1/src/Interface.java
	Tarea1/src/NewJFrame.form
	Tarea1/src/NewJFrame.java
	Tarea1/src/metodoGuardarObj.java