Works up to request sent to server
Merged conflicts
Merge branch 'master' of https://github.com/keylime503/cs118-project1