config周りを整理
Merge branch 'master' of github.com:bluebull/kimihate

Conflicts:
	app/public/javascripts/bundle.js