Merge pull request #2 from csce431-e/master

pull
Changing server code
Merge pull request #29 from tvkwoodlands/master

pushing server
Merge pull request #7 from csce431-e/master

April 4 merge