Prueba rama
Merge branch 'refs/heads/master' into Manuel

Conflicts:
	src/MyAgents/HelloWorldAgent.java
Merge remote-tracking branch 'refs/remotes/origin/Manuel'