Basura
Revert "Change1"

This reverts commit 6aba39653f92de2c232b6aab6afbf7c81d799306.

Conflicts:
	Hoja1.txt
	Hoja1/build.xml
	Hoja1/build/classes/GUI$1.class
	Hoja1/build/classes/GUI$2.class
	Hoja1/build/classes/GUI$3.class
	Hoja1/build/classes/GUI$4.class
	Hoja1/build/classes/GUI$5.class
	Hoja1/build/classes/GUI.class
	Hoja1/nbproject/build-impl.xml
	Hoja1/nbproject/genfiles.properties
	Hoja1/nbproject/private/private.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hoja1/nbproject/private/private.properties