pub key
Merge branch 'master' of github.com:tchwella/bitcoin-client

changes to protocol.h .cpp and net.cpp