Cambiando sabiendo que va a haber conflictos...
Merge branch 'master' of https://github.com/Arquisoft/ObservaTerra41.git

Conflicts:
	PLAYGROUND.txt