rails g scaffold multiple_choice_questions
migration database
rails g scaffold blank_questions
migration database
change resources
add column company_id
migration database
belongs_to hasmany -> model/~
rm scaffolds.css.sass
homepageをrender
mkfir companies -> questions
routingの設定
add image n setting phone
rails g scaffold multiple_choice_question
migration n rm scaffold css
add company_id
setting relation
問題ページへのリンク作成
multiple_choice_question を実装した
conflictを解決した

Conflicts:
	app/controllers/multiple_choice_questions_controller.rb
	app/views/multiple_choice_questions/_form.html.haml
	app/views/multiple_choice_questions/edit.html.haml
	app/views/multiple_choice_questions/index.html.haml
	app/views/multiple_choice_questions/new.html.haml
	app/views/multiple_choice_questions/show.html.haml
	config/routes.rb
	db/schema.rb