spacing stuff
added Operadores
conflict resolved