Cambio de Alberto
Version Alberto
s Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/Arquisoft/Entrecine7

Conflicts:
	PLAYGROUND.txt