Hola
Merge branch 'master' of https://github.com/Arquisoft/ObservaTerra11.git

Conflicts:
	PLAYGROUND.txt