Merge branch 'master' of github.com:DaniilBorodin/STRBTH

Conflicts:
	main.py