Merge branch 'Task/9_create_city_list_page_ID2/industry_list_page_ID3' into 'Task/8_create_top_page_ID1'

# Conflicts:
#   Gemfile.lock
#   db/schema.rb