Adding tours
State machine
Adding competitions
Migrations and factories
Task_6_competitions
Adding new files
Merge branch 'feature/competions_and_tours' into develop

Conflicts:
	Gemfile
	app/views/layouts/application.html.haml
	config/routes.rb
	db/schema.rb