Client stuff
Merge branch 'master' of https://github.com/asrivat1/DS_Final
Merge branch 'master' of https://github.com/asrivat1/DS_Final