comit3
committeste
teste conflito

teste conflito
teste commit 2
tira chave
Merge remote-tracking branch 'origin/testeGit'

Conflicts:
	FibonacciGit/src/com/fibonaccigit/FibonacciGit.java