CPUMiner20
Merge branch 'master' of https://github.com/gridcoin/Gridcoin-master

Conflicts:
	src/main.cpp
	src/makefile.osx