commit contador
commit contador
Merge branch 'branch' of https://github.com/Kat2/Metodosgit into branch
Merge branch 'branch' of https://github.com/Kat2/Metodosgit into branch
Merge branch 'branch' of https://github.com/Kat2/Metodosgit into branch
commit teste
Merge branch 'branch'

Conflicts:
	src/Contador.java