修改list
Merge branch 'develop' of github.com:WangTe/WuJiaDian into develop

Conflicts:
	application/views/list.php
文件夹合并
Signed-off-by: gradycheung <newline88@gmail.com>
删除工程配置
修改注册成功显示问题 即修改控制器register 将传递数组加入 $user_pass
忽略数据库配置文件
Merge branch 'zhang' into develop

Conflicts:
	application/config/database.php
排除数据库配置文件
忽略工程配置文件
Merge branch 'zhang' into develop
添加 test.txt
Merge branch 'zhang' into develop
删除 test.txt
删除 test.txt
Merge branch 'zhang' into develop
解决重复邮箱注册错误显示问题
Merge branch 'develop' of github.com:WangTe/WuJiaDian into develop

Conflicts:
	.gitignore