Resolvendo Conflitos......
Resolvendo Conflitos......
Resolvendo Conflitos......
Merge remote-tracking branch 'origin/master'

Conflicts:
	sistema-carona-rp/nbproject/private/private.properties
Merge remote-tracking branch 'origin/master'
deletenado esse lixo q veio