添加接口
Merge branch 'newui' of https://github.com/lln7777/zhuyun into user
Merge branch 'jack' of https://github.com/lln7777/zhuyun into user
Merge branch 'dev' of https://github.com/lln7777/zhuyun into user

Conflicts:
	views/main.ejs
切换分之之前提交代码
用户mongodb
切换分成之前的提交
添加user注册接口
Merge branch 'dev' of https://github.com/lln7777/zhuyun into user
登录，注册 前端页面
修改主键
Merge branch 'user' of https://github.com/lln7777/zhuyun into regui
设置主键
Merge branch 'user' of https://github.com/lln7777/zhuyun into regui
优化功能
修正接口
删除无用文件
Merge branch 'jack' of https://github.com/lln7777/zhuyun into user
Merge branch 'newui' of https://github.com/lln7777/zhuyun into user

Conflicts:
	public/stylesheets/index.css
	views/index.ejs
delete login.ejs