1
Merge branch 'develop' of github.com:krux02/UpvoidMiner into develop

Conflicts:
	README.md