ABNK-X: commentario cambio Francois
Merge pull request #17 from francoisgergaud/cambiosFrancois

ABNK-X: commentario cambio Francois
Merge pull request #18 from cflores/master

Merge pull request #1 from cfloresm/master
cambio-01: modificacion con conflicto
Merge pull request #19 from francoisgergaud/cambiosFrancois2

cambio-01: modificacion con conflicto
ABNK-265  cambios desde fork carlos .
Merge pull request #20 from cflores/new-feature2

ABNK-265  cambios desde fork carlos .
mi commit con conflicto
Merge pull request #21 from francoisgergaud/cambiosFrancois3

mi commit con conflicto
cambios newFeature Francois
Merge pull request #22 from francoisgergaud/newFeature

cambios newFeature Francois
ABNK-65 Add Change .:w
ABNK-56 Modified .
Merge pull request #25 from cflores/my-new-feature

My new feature
Ref: modify tests
Merge pull request #26 from francoisgergaud/newFeatureFrancois

Ref: modify tests
ref: Cambio prueba archivo .
Merge pull request #27 from cflores/newFeatureCarlos

ref: Cambio prueba archivo .
modification 2 Francois
Merge pull request #29 from francoisgergaud/newFeature2Francois

modification 2 Francois