Merge Caballero branch to spanish adventure

Added a new option to two existing choice points and createed a new "page" for those options.

fuego/fuego.md
caballero/caballero.md
Here's another deleted line.