Agrego la palabra 3
agrego la palabra 5
Agrego la palabra 4
Agrego la palabra 6
Agrego la palabra 7
Agrego la palabra 8
Agrego la palabra 9
Merge branch 'master' into prueba

Conflicts:
	ConsultaHistoriaCredito/src/main/java/com/consultahc/application/Prueba.java
Agrego palabra 10
Merge remote-tracking branch 'origin/master' into prueba

Conflicts:
	ConsultaHistoriaCredito/src/main/java/com/consultahc/application/Prueba.java
Palabra 10
Prueba 21
palabra30
palabra31
Merge branch 'prueba'

Conflicts:
	ConsultaHistoriaCredito/.settings/org.eclipse.wst.common.component
	ConsultaHistoriaCredito/src/main/java/com/consultahc/application/Prueba.java
aaa