modified:   proof_of_work/Server.h
	modified:   proof_of_work/main.h
Merge branch 'master' of https://github.com/d3rrial/proof_of_work_sha256_test

Conflicts:
	proof_of_work/Server.h
	proof_of_work/main.h