Juan. Concurrencia
resolucion conflicto
Merge branch 'master' of https://github.com/capitangolo/CursoJavaCrea20121227