probando conexion... git->netbeans
Merge branch 'master' of https://github.com/carlochess/uvshop.git