どうしましょうって感じの値調整とvulcan
Merge branch 'master' of https://github.com/ogawakeisuke/one_per_f_web

Conflicts:
	Gemfile