atualização nova
Merge branch 'master' of https://github.com/skywalkerd/zoera

Conflicts:
	sensual.txt
mudancas
caralhoooo
AHHHH
mudança