i'm going to edit this commit later, please disregard
Merge branch 'master' of https://github.com/haocow/cs118-project1

I'm just messing around with some stuff, please disregard
reworked thread.h/cc & http-proxy.cc