Nothing
Merge branch 'master' of github.com:tengcong/qa-notification

Conflicts:
	app/views/questions/show.html.erb