create wuyujing file`
Merge remote-tracking branch 'origin/master'
modify main.c
solve merge conflict