conexion BD
Merge branch 'master' of
https://github.com/CluedoOnline/CluedoOnline.git

Conflicts:
	CluedoOnline/.classpath
	CluedoOnline/src/otros/ConnectionManager.java