calculates both types of throughput now
Merge branch 'master' of https://github.com/matthew-somers/158-C-lan-simulator