updated info
Merge branch 'master' of https://github.com/d3rrial/proof_of_work_sha256_test

Conflicts:
	proof_of_work/main.cpp

	deleted:    proof_of_work/main.cpp