Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/rakuten-card' into add_hotel_info
Update: addplan form-style
Update: search-hotel form-style
Update: config/routes.rb
Add newplan/search-hotel
Refactoring
Update: app/assets/javascripts/newplan.js
Add function when search-hotel submit button click
Update: app/controllers/newplan_controller.rb
Add search_hotel method
Update: app/views/newplan/index.html.erb
Remove test data
Merge branch 'add_hotel_info'
Update: app/assets/javascripts/newplan.js app/controllers/newplan_controller.rb
Remove rakuten search
Merge branch 'remove_rakuten_search_from_add_method'
Merge remote-tracking branch 'origin/master' into rakuten-card

Conflicts:
	app/views/newplan/index.html.erb
Remove: spec/views/newplan/index.html.erb_spec.rb
Update: spec/controllers/newplan/index.html.erb_spec.rb
Refactoring ( Remove extra space )
Merge branch 'comment_out_test'
Update: app/assets/javascripts/newplan.js
Redraw hotel-card
Merge branch 'redraw_hotel'
Merge remote-tracking branch 'origin/master' into rakuten-card
Fix addplan-form inputed_message to remove