添加需求文档
Merge branch 'duziaqin' of https://github.com/BiaoPro/community into biao
test confilct
test confilct
修改doc文档
完善需求doc
Delete ~$民网站简单的需求分析.doc
201407161424johncommit
201407161432johncommit
'添加数据库设计文档、在创建部分model、添加utils工具类'
删除冲突代码
Merge branch 'biao' of https://github.com/BiaoPro/community into john
test conflict
test confilct
test test
删除多余doc文档

删除多余doc文档
Update README.md

删除多余README.md代码
update
update readme.md