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

pushing server THAT IS NOW AWESOME