Changed peers list in NeighborController back to ArrayList
fixed NeighborController.getPeer()
Very few changes, gonna expand on Edge tomorrow to handle chokes
Merge branch 'master' of https://github.com/marcusball/networking-project
completed merge of master