set http request
Merge branch 'master' of https://github.com/nickcappola/CPSC-360-Final-Project
updated server and client, commented some of client code out until timeouts are added