hooking up serverside to client
Merge branch 'master' of github.com:davidgbe/csci_201_final
updated server code
Merge branch 'master' of github.com:davidgbe/csci_201_final