.gitingore public/uploads
Merge branch 'master' of https://github.com/HuberyDu/bancheng