cambios fileA y add fileb
commiteo el fileC
Merge branch 'master' of https://github.com/rliberal/git-test