Merge origin/master

Conflicts:
	monicaticoo/src/db_managment/Direct_Control_BD.java
	monicaticoo/src/monicaticoo/main.java
Merge origin/master

Conflicts:
	monicaticoo/src/db_managment/Direct_Control_BD.java
	monicaticoo/src/monicaticoo/main.java
AHHHHHHHHHHHHHHHHHHHHhhh
AHHHHHHHHHHHHHHHHHHHHhhh 2
Merge origin/master

Conflicts:
	monicaticoo/src/monicaticoo/main.java
AHHHHHHHHHHHHHHHHHHHHhhh 3
prueba con github
Aca me devuelvo
Merge pull request #8 from euw15/master

No se que hago