Terminado el metodo que permite vigilar si se crearon los archivos de
respaldo a una determianda hora
modified:   pycondor.cfg
modified:   pycondor.py
modified:   pycondor.cfg
modified:   pycondor.py
new file:   cliente.py
new file:   demonioServer1.py
modified:   cliente.py
renamed:    cliente.py -> clienteZMQ.py
modified:   pycondor.cfg
new file:   servidor.py
modified:   pycondor.cfg
modified:   pycondor.cfg
Merge branch 'master' of http://github.com/foxcarlos/pycondor

Conflicts:
	pycondor.cfg
	servidor.py

modified:   pycondor.cfg
modified:   servidor.py
deleted:    servidor.py