CD1
CD2
Create README.md

fichero de conflicto
Merge remote-tracking branch 'origin/develop'