Agregando favicon
agregando el merge