Cosas editadas
Html + js
js
Merge remote-tracking branch 'origin/master'