modified:   proof_of_work/main.cpp
	modified:   proof_of_work/proof_of_work.vcxproj
Merge branch 'boost' of https://github.com/d3rrial/proof_of_work_sha256_test into boost

Conflicts:
	proof_of_work/main.cpp

	deleted:    .gitignore
	deleted:    README.md
	deleted:    TODO.md
	deleted:    proof_of_work/Server.h
	deleted:    proof_of_work/main.cpp
	deleted:    proof_of_work/main.h
	deleted:    proof_of_work/proof_of_work.sln
	deleted:    proof_of_work/proof_of_work.vcxproj
	deleted:    proof_of_work/proof_of_work.vcxproj.filters
	README.md
	TODO.md
	proof_of_work/
	new file:   .gitignore
	new file:   README.md
	new file:   TODO.md
	new file:   proof_of_work/Server.h
	new file:   proof_of_work/main.cpp
	new file:   proof_of_work/main.h
	new file:   proof_of_work/proof_of_work.sln
	new file:   proof_of_work/proof_of_work.vcxproj
	new file:   proof_of_work/proof_of_work.vcxproj.filters