ventana diego
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
Merge branch 'master' of
https://github.com/formatic-practicas/pruebasJava.git

Conflicts:
	src/Diego.java
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
moviendo el package DiegoRL
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git