updates to server and client
Merge branch 'master' of github.com:sgluebbert/CISS465NetworkGame