first commit
Merge branch 'master' of https://github.com/arkhemlol/test_task

Conflicts:
	main.js