Some protocol changes got lost somewhere, dunno how
Merge branch 'master' of https://github.com/ryancheu/6.857FinalPaper.git
Fixing some more changes that got lost along the way somehow