some client changes
Merge branch 'hw4' of github.com:Squaar/cs-450-hw1 into hw4