git mv to rename a file.
Merge branch 'master' into test-branch
add touxiang.png
Merge branch 'test-branch'