agregado mas contenido
Merge branch 'master' of https://github.com/carlochess/TareaIIIDesarrolloII

Conflicts:
	src/org/desarrollo/taller3/Principal.java