在首页显示真正的公告
Merge branch 'master' of github.com:greenmoon55/online_tutoring_app

Conflicts:
	app/views/layouts/_header.html.erb