modificado b.txt rama1
Merge branch 'rama1'