Removendo peep.
Resolvendo os conflitos.
Merge pull request #33 from ramirlm/ugo

Removendo peeps.