2
Merge branch 'master' of https://github.com/Sashok121/final-task.git into developer

Conflicts:
	scripts/script.js
add calculator function
add function competitors
add function competitors
last chenge
1