Commit Ruben

Mi commit
Merge branch 'master' of https://github.com/omero/demo_verano

Conflicts:
	ruben.txt
Merge branch 'master' of https://github.com/omero/demo_verano

Conflicts:
	ruben.txt
Merge branch 'master' of https://github.com/omero/demo_verano