基础结构搭建
mongodb 测试
add user conroller
Merge branch 'zac'
多人协作开发指南
多人协作开发指南
up
up
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
开发文档添加,注册 登录页添加
merge
up
add user
merge

Merge branch 'master' of https://github.com/Angel-fund/geekplay

Conflicts:
	geekplay/api/controllers/UserController.js
	geekplay/api/models/User.js
up