this is git commit
add a new line to git.txt
Merge branch 'master' of https://github.com/yuchting/test_git