新增灰色
Merge branch 'master' of github.com:evendesign/4am.tw.source

Conflicts:
	stylesheets/all.css