commit
Merge remote-tracking branch 'origin/branch'

Conflicts:
	bin/ifce/Contador.class
	src/ifce/Contador.java