Probando hibernate.cfg.xml
Merge branch 'master' of https://github.com/sharker86/Procuidado.git

Conflicts:
	bin/hibernate.cfg.xml
	src/hibernate.cfg.xml
Resuelto hibernate.cfg.xml