nuevo test agregado
Merge branch 'HabilidadEspecialRobot'

Conflicts:
	spec/models/robot_spec.rb