# Conflicts:
#   Gemfile
#   Gemfile.lock
#   app/models/city.rb
#   db/schema.rb
#   lib/tasks/web_crawler.rake

created sample rake task for crawler

See merge request !4

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

Task/8 create top page id1

See merge request !8

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

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

Create migration, add option to model and install Active Record

See merge request !3

Task/6 create crawler

See merge request !6

Create migration, add option to model and install Active Record

See merge request !5