this is the first commit
Merge branch 'master' of https://github.com/tremilla55/learngit
modified the second file.