edit settings
modify gitignore
Merge branch 'master' of /home/wuhaotian/pkuapp_server