cambios...
Merge branch 'master' of https://github.com/gcba/infoDisplay

Conflicts:
	prueba.html