un ensayo
Merge remote-tracking branch 'origin/master'

Conflicts:
	Repositorio/index.html
	Repositorio/js/main.js