terminada logica
Merge branch 'master' of https://github.com/nicolas0p/BibliotecaConcorrente

Conflicts:
	equipe/Equipe.java