继续更新mysql
调试用户头像
Merge remote-tracking branch 'origin2/dev' into ricky
权限增加完毕
merge conflict
添加用户头像功能
更新readme
update
Merge branch 'ricky' into dev
完成forum_model
完成forum_model
merge
fixed conflicts
tiny bug
完成forum的controller
测试
Merge branch 'dev' of github.com:JYWa/teamstyle16 into nh
merge thy
Merge branch 'dev' of github.com:JYWa/teamstyle16 into dev