Esto no vale
Merge branch 'master' of https://github.com/antoniosastre/Sincronizador

Conflicts:
	src/ficheros/eliminarfichero.cpp