subir cambios
Merge branch 'master' of
https://github.com/formatic-practicas/pruebasJava.git
Merge branch 'master' of
https://github.com/formatic-practicas/pruebasJava.git
muevo cosas
Merge branch 'master' of
https://github.com/formatic-practicas/pruebasJava.git

Conflicts:
	src/ventanaJoseCarlos.java
muevo cosas
Merge branch 'master' of
https://github.com/formatic-practicas/pruebasJava.git

Conflicts:
	src/ventanaJoseCarlos.java