node is added
Merge remote-tracking branch 'origin/master'

Conflicts:
	Debug/GraceDHT.exe
	Debug/GraceDHT.ilk
	Debug/GraceDHT.pdb
	GraceDHT.sdf
	GraceDHT.v12.suo
	GraceDHT/Debug/GraceDHT.log
	GraceDHT/Debug/GraceDHT.tlog/CL.read.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/CL.write.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/cl.command.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/link.command.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/link.read.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/link.write.1.tlog
	GraceDHT/Debug/vc120.idb
	GraceDHT/Debug/vc120.pdb
	GraceDHT/GraceDHT.vcxproj
	GraceDHT/GraceDHT.vcxproj.filters
	GraceDHT/dht/node.h
	GraceDHT/dht/node_id.h
Merge remote-tracking branch 'origin/master'

Conflicts:
	Debug/GraceDHT.exe
	Debug/GraceDHT.ilk
	Debug/GraceDHT.pdb
	GraceDHT.sdf
	GraceDHT.v12.suo
	GraceDHT/Debug/GraceDHT.log
	GraceDHT/Debug/GraceDHT.tlog/CL.read.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/CL.write.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/cl.command.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/link.command.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/link.read.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/link.write.1.tlog
	GraceDHT/Debug/vc120.idb
	GraceDHT/Debug/vc120.pdb
	GraceDHT/GraceDHT.vcxproj
	GraceDHT/GraceDHT.vcxproj.filters
	GraceDHT/dht/node.h
	GraceDHT/dht/node_id.h
Merge remote-tracking branch 'origin/master'

Conflicts:
	Debug/GraceDHT.exe
	Debug/GraceDHT.ilk
	Debug/GraceDHT.pdb
	GraceDHT.sdf
	GraceDHT.v12.suo
	GraceDHT/Debug/GraceDHT.log
	GraceDHT/Debug/GraceDHT.tlog/CL.read.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/CL.write.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/cl.command.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/link.command.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/link.read.1.tlog
	GraceDHT/Debug/GraceDHT.tlog/link.write.1.tlog
	GraceDHT/Debug/vc120.idb
	GraceDHT/Debug/vc120.pdb
	GraceDHT/GraceDHT.vcxproj
	GraceDHT/GraceDHT.vcxproj.filters
	GraceDHT/dht/node.h
	GraceDHT/dht/node_id.h