коммит
Merge branch 'master' of github.com:randomrepo/randomrepo

Conflicts:
	ArbitrageManagerSolution/db/ArbitrageManagerDataBase.db
	Js/getProxy.js
	Js/marathon.js
	Js/pinnacle.js