client update
Merge branch 'master' of github.com:wrbeasl/CPSC-3600-Final-Project