Preparing for merge
More merging
merging my branch with master
Added NeighborController class to handle choking/unchoking
Minor changes to Edge and NeighborController
Created new class Host and changed Peer to only represent others
Actually adding Host now
merged peer and peerprocess - broken until receive host class
Merge branch 'master' of github.com:marcusball/networking-project
merged things *untested*
merged PeerManager into NeighborController; made NC a static class
More changes to Peer to track dl speed
hey maybe there's no bugs
Merge branch 'master' of github.com:marcusball/networking-project
fixed possible issues with PeerInfo parser; added my own PeerInfo