add gem select2-rails
rename apllication controller
ignore .idea
Merge branch 'feature/main_page_3' into develop

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.haml
	config/routes.rb
	db/schema.rb
welcome page
header fix
Merge branch 'feature/competions_and_tours' into develop

Conflicts:
	Gemfile
	app/views/layouts/application.html.haml
	config/routes.rb
	db/schema.rb
Merge branch 'develop' of github.com:PanfilovDenis/masterit into feature/crud_nomination_of_work-5

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
add schema.rb in gitignore
add nominates
add registation works
Merge branch 'feature/crud_nomination_of_work-5' into staging

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/controllers/web/application_controller.rb
	app/views/layouts/application.html.haml
	config/routes.rb
	db/schema.rb
fixes errors
Merge branch 'feature/crud_nomination_of_work-5' into staging