Tentativa de comparacao
Ajustando Data
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/local/Local.java