Task_6_competitions
Adding new files
Merge branch 'feature/competions_and_tours' into staging

Conflicts:
	app/views/layouts/application.html.haml
Refactoring main layout