working on new client
Merge branch 'master' of github.com:seanfrischmann/305_hw5