modified:   bin/prffwrk/PrfFWrk.class
	modified:   src/prffwrk/PrfFWrk.java
Merge branch 'master' of https://github.com/d3rrial/proof_of_work_sha256_test_java

Conflicts:
	bin/prffwrk/PrfFWrk.class
	src/prffwrk/PrfFWrk.java
	new file:   .classpath
	new file:   .project
	new file:   README.md
	new file:   bin/prffwrk/PrfFWrk.class
	new file:   src/prffwrk/PrfFWrk.java
Merge branch 'master' of https://github.com/d3rrial/proof_of_work_sha256_test_java

Conflicts:
	bin/prffwrk/MT_PARAMS.class
	bin/prffwrk/boolDone.class
	bin/prffwrk/hashG.class
	bin/prffwrk/workG.class

	new file:   .gitignore
	new file:   bin/prffwrk/MT_PARAMS.class
	modified:   bin/prffwrk/PrfFWrk.class
	new file:   bin/prffwrk/Server.class
	new file:   bin/prffwrk/boolDone.class
	new file:   bin/prffwrk/hashG.class
	new file:   bin/prffwrk/mtEntry.class
	new file:   bin/prffwrk/workG.class
	modified:   src/prffwrk/PrfFWrk.java
java