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

Conflicts:
	README.md