creado c.txt
Merge branch 'branch1' of https://github.com/juanraposo/gittest into branch1