换成图片
Merge branch 'master' of https://github.com/fws407296762/tynews

Conflicts:
	css/app.css
	index.html
	js/public.js