cambiando de 30 min a 60 min
Merge branch 'develop' of
https://github.com/jhonle/inteligencia-artificial into develop

Conflicts:
	src/agentes/AgenteX.java
arreglando conflictos