観光スポット表示
Merge branch 'master' of https://github.com/tecchan/tabi

Conflicts:
	Gemfile
	Gemfile.lock
	README.md
	app/assets/images/logo_s.png
	app/assets/javascripts/application.js
	app/assets/stylesheets/top.css.scss
	app/assets/stylesheets/tour.css.scss
	app/views/top/index.html.erb
	app/views/tour/question07.html.erb
	app/views/tour/question11.html.erb
	app/views/tour/search.html.erb
	app/views/tour/select.html.erb