Testando
Reste
1
wiggle
abc
mengo
Merge branch 'master' of https://github.com/sandeco/macaxeira

Conflicts:
	Rodrigo
Clezio
Clézio :)
Projeto
testando Conflito de envio
Update TesteConflito
editando o teste no eclipse
resolvendo conflito
Conflicts:
	APP/TesteConflito
Merge branch 'master' of https://github.com/sandeco/macaxeira.git