made a change
modified zhang.txt on branch master
zhang.txt
zhang
delete index.txt
modified main.c
Merge branch 'iss1'
finished file