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

Conflicts:
	src/ifce/Contador.java