en la develop
a la segunda
rafa
cambio en la develop
en des
conflicto
paso a la maser
Create kktita.txt
Merge remote-tracking branch 'origin/develop' into develop
rafa
rafa me lo salto
borro
Merge remote-tracking branch 'origin/develop' into segunda

Conflicts:
	src/main/java/com/bankia/arq/tabit/repositories/Dominio004DAO.java
rafa
Merge branch 'develop'

Conflicts:
	src/main/java/com/bankia/arq/tabit/repositories/Dominio004DAO.java
Merge remote-tracking branch 'origin/master'