asd
Merge branch 'master' of https://github.com/jocelio/projectFaculdade.git
Merge branch 'master' of https://github.com/jocelio/projectFaculdade.git
projeto web atualizado com hibernate
Merge branch 'master' of https://github.com/jocelio/projectFaculdade.git
asdf
Merge branch 'master' of https://github.com/jocelio/projectFaculdade.git

Conflicts:
	ICoddee/src/com/icoddee/controle/ControleEmprestimo.java
	ICoddee/src/com/icoddee/controle/ControleLivros.java