Merge pull request #1 from csce431-e/master

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

pushing server