cambios
Merge branch 'master' of https://github.com/Arquisoft/Entrecine7.git

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

Conflicts:
	PLAYGROUND.txt
	bin/PLAYGROUND.txt