Cambio
Mezlado con el dragon de Maria
Merge branch 'master' of https://github.com/Arquisoft/Entrecine1

Conflicts:
	PLAYGROUND.txt