eliminar enies
arreglado conflicto
Merge branch 'master' of https://github.com/Hologramia/Hologramia