Server buttons for quitting while waiting
Merge pull request #49 from tvkwoodlands/master

pushing server