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

Conflicts:
	.project
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
dani
Merge branch 'master' of
https://github.com/formatic-practicas/pruebasJava.git

Conflicts:
	README.md
Merge branch 'master' of
https://github.com/formatic-practicas/pruebasJava.git

Conflicts:
	README.md
Dani Java
Agregando class
Diego clase mejorada
Commit
Merge branch 'master' of
https://github.com/formatic-practicas/pruebasJava.git
syrah
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
clase operativa
Mi ventana nueva
cambios
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
Mi ventana joseA