Very few changes, gonna expand on Edge tomorrow to handle chokes
Merge branch 'master' of https://github.com/marcusball/networking-project