Peer-to-peer proposal from hallettj
Merge pull request #53 from hallettj/hallettj

Peer-to-peer proposal from hallettj