Commit de prueba. Comentario en Action.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	BatallaPokemon/src/ia/battle/entities/Action.java