修改样式
Merge branch 'master' of https://github.com/AllSundays/yummy

Conflicts:
	ctrls/web.py