Copiar Carpeta
Merge branch 'master' of https://github.com/antoniosastre/Sincronizador

Conflicts:

Sincronizador/Sincronizador.xcodeproj/project.xcworkspace/xcuserdata/Sas
tre.xcuserdatad/UserInterfaceState.xcuserstate
	src/ficheros/eliminarfichero.cpp