Merge branch 'master' of https://github.com/Adrxx/UNION

Conflicts:
index.html
Combinado

creo..