Merge pull request #7 from csce431-e/master

updating
server-based play code
Merge pull request #66 from jcrabb13/master

server code