添加upyun 的logo
Merge branch 'master' of https://github.com/zhzenghui/YMM-Site

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