forms_controllerのspec．thank_youとsorryの追加
Merge branch 'master' of github.com:ychubachi/web_marketing
Merge branch 'master' of github.com:ychubachi/web_marketing

Conflicts:
	app/controllers/forms_controller.rb
	spec/controllers/forms_controller_spec.rb