cosas
Merge branch 'Alvaro' of github.com:Aridane/agente_AIA into Aridane

Conflicts:
	src/mibot/MiBot.java
	src/mibot/MiBotseMueve.java
	src/mibot/SeekGoal.clp
DecideBattle.clp
Merge branch 'Aridane'

Conflicts:
	src/mibot/MiBot.java
	src/mibot/MiBotseMueve.java
DecideBattle
DecideBattle
Cosas nuevas
Cosas nuevas
Merge branch 'Alvaro' of github.com:Aridane/agente_AIA into Alvaro

Conflicts:
	src/mibot/MiBotseMueve.java
	src/mibot/SeekGoal.clp
Merge branch 'Alvaro'

Conflicts:
	src/mibot/MiBotseMueve.java
	src/mibot/SeekGoal.clp
meh
Merge branch 'Aridane'

Conflicts:
	src/mibot/MiBotseMueve.java
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
COsas arregladas
Cosas arregladitas
DecideWeapon, DecideBattle en progreso
bogus