overwritten
makefile overwritten
error
merge conflict
make file
modify the function name
Merge pull request #14 from GuoSongtao/master

ls name modification