Usando el repositorio wamp.
Merge https://github.com/delallavemartin/florestaSite

Conflicts:
	adolescentes.php