Stopped server from dying if client exits
Merge branch 'master' of github.com:swillard13/Spaceteam