Cosas nuevas
Hola gay
Merge branch 'master' of github.com:Aridane/agente_AIA

Conflicts:
	src/mibot/DecideBattle.clp
	src/mibot/MiBot.java
	src/mibot/MiBotseMueve.java
	src/mibot/SeekGoal.clp
algoritmo genetico actualizado
Merge branch 'Alvaro'

Conflicts:
	src/mibot/MiBotseMueve.java