server

server.c
Merge remote-tracking branch 'JieZhu/master'