Servidor SOAP
Merge branch 'master' of https://github.com/buster13/GIT-Proyecto-Final
Merge branch 'master' of https://github.com/buster13/GIT-Proyecto-Final

Conflicts:
	BolsaDeTareasRMI/build/classes/client/MasterNode.class
Merge branch 'master' of https://github.com/buster13/GIT-Proyecto-Final

Conflicts:
	BolsaDeTareasRMI/nbproject/private/private.properties

git pull
git commit