derped around a bit
Merge branch 'master' of github.com:DakotaNelson/olin-networking-class
yeah there were some differences
got stuff working to let us kill the threads
Merge branch 'master' of github.com:DakotaNelson/olin-networking-class
merged some things