继续更新mysql
add footer
权限增加完毕
merge conflict
Merge branch 'ricky' into dev
完成forum_model
完成forum_model
merge
header and footer
fixed conflicts
tiny bug
完成forum的controller
decorate login page
测试
Merge branch 'dev' of github.com:JYWa/teamstyle16 into nh
decorate the login page
merge thy
Merge branch 'dev' of github.com:JYWa/teamstyle16 into dev
test
merge