Commit tentativa de conflito
Merge branch 'branch' of https://github.com/castelom/GitMetodos into
branch

Conflicts:
	src/ifce/Contador.java
Commit tentativa de conflito
Commit tentativa de conflito
Atualização contador, tentativa de conflito
Merge branch 'branch' of https://github.com/castelom/GitMetodos into
branch

Conflicts:
	bin/ifce/Contador.class
	src/ifce/Contador.java
Merge remote-tracking branch 'origin/branch'