roomのcssを進めた
Merge remote-tracking branch 'remotes/origin/master' into design

Conflicts:
	public/sass/recipe-list.scss
Merge pull request #25 from cloudspiral-c9/design

roomのcssを進めた