登陆页面样式调整
首页调整
Merge branch 'master' of github.com:mhjerryjin/mdconference

Conflicts:
	web/static/js/Script.js