test
test
checkout/registrarionのformの書き方修正
一旦保存
jquery.turbolinksを導入
merge
test
Merge branch 'dev' into prod

Conflicts:
	app/views/spree/user_passwords/new.html.erb
Merge remote-tracking branch 'bloomee/prod' into prod
headを元に戻す