modificado diego
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
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git