add footer
header and footer
fixed conflicts
tiny bug
测试
Merge branch 'dev' of github.com:JYWa/teamstyle16 into nh