Merge pull request #28 from tvkwoodlands/master

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

pull