t
Merge branch 'master' of https://github.com/vagio/sed

Conflicts:
	contenido/Arboles/arbolesjson/515_3-10-38-118-902-82-0.json
Merge branch 'master' of https://github.com/vagio/sed

Conflicts:
	contenido/Arboles/imagenesarboles/imgobjetivo515_3-10-38-118-902-82-0.png
	contenido/Arboles/imagenesarboles/imgproblema515_3-10-38-118-902-82-0.png