Cambio en pruebaConfig.txt
Merge branch 'OTPlay' of https://github.com/Arquisoft/ObservaTerra51.git
into OTPlay

Conflicts:
	prueba/PruebaConfig.txt