.
Merge remote-tracking branch 'origin/master'
Pruebas
:P
asd
Merge branch 'master' of https://github.com/Arquisoft/Entrecine6.git

Conflicts:
	PLAYGROUND.txt
Merge branch 'master' of https://github.com/Arquisoft/Entrecine6.git