add gem select2-rails
Merge branch 'feature/add_rails_admin' into staging

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.haml
	config/routes.rb
	db/schema.rb
heroku fix
heroku fix #2
fix heroku #3
controller bugfix
Adding tours
State machine
Adding competitions
Migrations and factories
Merge branch 'feature/competions_and_tours' into staging

Conflicts:
	Gemfile
	config/routes.rb
Task_6_competitions
Adding new files
Merge branch 'feature/competions_and_tours' into staging

Conflicts:
	app/views/layouts/application.html.haml
Refactoring main layout
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