lingchun
master
confict fixecd
add 1.c