add new file function.c
edit xxx
Merge remote-tracking branch 'origin/master'