Módulo de sincronización, sin acabar
Merge branch 'master' of
https://github.com/ivan-ramon-moran/NetBackup.git

Conflicts:
	NetBackup/src/SistemaOperativo.java